zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/include/IceUtil/MutexProtocol.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -21,7 +21,7 @@ enum MutexProtocol
     PrioNone
 };
 
-ICE_UTIL_API MutexProtocol getDefaultMutexProtocol();
+ICE_API MutexProtocol getDefaultMutexProtocol();
 
 } // End namespace IceUtil
 

data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -20,7 +20,7 @@ template<class T>
 class MutexPtrLock
 {
 public:
-    
+
     MutexPtrLock<T>(const T* mutex) :
         _mutex(mutex),
         _acquired(false)
@@ -66,9 +66,9 @@ public:
     {
         return _acquired;
     }
-   
+
 private:
-    
+
     // Not implemented; prevents accidental use.
     //
     MutexPtrLock<T>(const MutexPtrLock<T>&);

data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -20,7 +20,7 @@ template<class T>
 class MutexPtrTryLock
 {
 public:
-    
+
     MutexPtrTryLock<T>(const T* mutex) :
         _mutex(mutex),
         _acquired(false)
@@ -65,9 +65,9 @@ public:
     {
         return _acquired;
     }
-   
+
 private:
-    
+
     // Not implemented; prevents accidental use.
     //
     MutexPtrTryLock<T>(const MutexPtrTryLock&);

data/ext/ice/cpp/include/IceUtil/Optional.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -10,12 +10,14 @@
 #ifndef ICE_UTIL_OPTIONAL_H
 #define ICE_UTIL_OPTIONAL_H
 
+#ifndef ICE_CPP11_MAPPING
+
 #include <IceUtil/Config.h>
 
 namespace IceUtilInternal
 {
 
-struct NoneType 
+struct NoneType
 {
 };
 
@@ -50,11 +52,11 @@ public:
     Optional(const Optional<Y>& r) : _value(r._value), _isSet(r._isSet)
     {
     }
-    
+
     ~Optional()
     {
     }
-    
+
     Optional& operator=(IceUtilInternal::NoneType)
     {
         _value = T();
@@ -69,7 +71,7 @@ public:
         _isSet = true;
         return *this;
     }
-        
+
     template<typename Y>
     Optional& operator=(const Optional<Y>& r)
     {
@@ -85,33 +87,44 @@ public:
         return *this;
     }
 
-    const T& get() const
+    const T& value() const
     {
         checkIsSet();
         return _value;
     }
-    T& get()
+
+    T& value()
     {
         checkIsSet();
         return _value;
     }
 
+    const T& get() const
+    {
+        return value();
+    }
+
+    T& get()
+    {
+        return value();
+    }
+
     const T* operator->() const
     {
-        return &get();
+        return &value();
     }
     T* operator->()
     {
-        return &get();
+        return &value();
     }
 
     const T& operator*() const
     {
-        return get();
+        return value();
     }
     T& operator*()
     {
-        return get();
+        return value();
     }
 
     operator bool() const
@@ -119,8 +132,8 @@ public:
         return _isSet;
     }
 
-    bool operator!() const 
-    { 
+    bool operator!() const
+    {
         return !_isSet;
     }
 
@@ -144,20 +157,20 @@ private:
             throwOptionalNotSetException(__FILE__, __LINE__);
         }
     }
-    
+
     void throwOptionalNotSetException(const char *, int) const;
 
     T _value;
     bool _isSet;
 };
 
-template<class T> inline Optional<T> 
+template<class T> inline Optional<T>
 makeOptional(const T& v)
 {
     return Optional<T>(v);
 }
 
-template<typename T> inline void 
+template<typename T> inline void
 Optional<T>::throwOptionalNotSetException(const char* file, int line) const
 {
     throw OptionalNotSetException(file, line);
@@ -222,7 +235,7 @@ inline bool operator==(const Optional<T>& lhs, const Y& rhs)
     {
         return false;
     }
-    else 
+    else
     {
         return *lhs == rhs;
     }
@@ -274,7 +287,7 @@ inline bool operator==(const Y& lhs, const Optional<T>& rhs)
     {
         return false;
     }
-    else 
+    else
     {
         return lhs == *rhs;
     }
@@ -320,3 +333,4 @@ inline bool operator>=(const Y& lhs, const Optional<T>& rhs)
 }
 
 #endif
+#endif

data/ext/ice/cpp/include/IceUtil/Options.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -22,47 +22,46 @@
 namespace IceUtilInternal
 {
 
-class ICE_UTIL_API APIException : public IceUtil::Exception
+class ICE_API APIException : public IceUtil::ExceptionHelper<APIException>
 {
 public:
 
     APIException(const char*, int, const ::std::string&);
+#ifndef ICE_CPP11_COMPILER
     virtual ~APIException() throw();
-    virtual ::std::string ice_name() const;
+#endif
+    virtual ::std::string ice_id() const;
     virtual void ice_print(std::ostream&) const;
+#ifndef ICE_CPP11_MAPPING
     virtual APIException* ice_clone() const;
-    virtual void ice_throw() const;
+#endif
 
     ::std::string reason;
-
-private:
-
-    static const char* _name;
 };
 
-ICE_UTIL_API ::std::ostream& operator<<(::std::ostream&, const APIException&);
+ICE_API ::std::ostream& operator<<(::std::ostream&, const APIException&);
 
-class ICE_UTIL_API BadOptException : public IceUtil::Exception
+class ICE_API BadOptException : public IceUtil::ExceptionHelper<BadOptException>
 {
 public:
 
     BadOptException(const char*, int, const ::std::string&);
+#ifndef ICE_CPP11_COMPILER
     virtual ~BadOptException() throw();
-    virtual ::std::string ice_name() const;
+#endif
+    virtual ::std::string ice_id() const;
     virtual void ice_print(std::ostream&) const;
+
+#ifndef ICE_CPP11_MAPPING
     virtual BadOptException* ice_clone() const;
-    virtual void ice_throw() const;
+#endif
 
     ::std::string reason;
-
-private:
-
-    static const char* _name;
 };
 
-ICE_UTIL_API ::std::ostream& operator<<(::std::ostream&, const BadOptException&);
+ICE_API ::std::ostream& operator<<(::std::ostream&, const BadOptException&);
 
-class ICE_UTIL_API Options
+class ICE_API Options
 {
 public:
 

data/ext/ice/cpp/include/IceUtil/OutputUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -18,7 +18,7 @@
 namespace IceUtilInternal
 {
 
-ICE_UTIL_API std::string int64ToString(IceUtil::Int64);
+ICE_API std::string int64ToString(IceUtil::Int64);
 
 // ----------------------------------------------------------------------
 // OutputBase
@@ -31,7 +31,7 @@ ICE_UTIL_API std::string int64ToString(IceUtil::Int64);
 // manually I've decided to leave them as virtual.
 //
 
-class ICE_UTIL_API OutputBase : private ::IceUtil::noncopyable
+class ICE_API OutputBase : private ::IceUtil::noncopyable
 {
 public:
 
@@ -74,21 +74,21 @@ protected:
     bool _separator;
 };
 
-class ICE_UTIL_API NextLine
+class ICE_API NextLine
 {
 };
-extern ICE_UTIL_API NextLine nl;
+extern ICE_API NextLine nl;
 
-class ICE_UTIL_API Separator
+class ICE_API Separator
 {
 };
-extern ICE_UTIL_API Separator sp;
+extern ICE_API Separator sp;
 
 // ----------------------------------------------------------------------
 // Output
 // ----------------------------------------------------------------------
 
-class ICE_UTIL_API Output : public OutputBase
+class ICE_API Output : public OutputBase
 {
 public:
 
@@ -101,8 +101,8 @@ public:
     void sb(); // Start a block.
     void eb(); // End a block.
 
-    void spar(); // Start a paramater list.
-    void epar(); // End a paramater list.
+    void spar(char = '('); // Start a paramater list.
+    void epar(char = ')'); // End a paramater list.
 
 private:
 
@@ -148,10 +148,10 @@ operator<<(Output& o, const Separator&)
     return o;
 }
 
-class ICE_UTIL_API StartBlock
+class ICE_API StartBlock
 {
 };
-extern ICE_UTIL_API StartBlock sb;
+extern ICE_API StartBlock sb;
 
 template<>
 inline Output&
@@ -161,10 +161,10 @@ operator<<(Output& o, const StartBlock&)
     return o;
 }
 
-class ICE_UTIL_API EndBlock
+class ICE_API EndBlock
 {
 };
-extern ICE_UTIL_API EndBlock eb;
+extern ICE_API EndBlock eb;
 
 template<>
 inline Output&
@@ -174,10 +174,10 @@ operator<<(Output& o, const EndBlock&)
     return o;
 }
 
-class ICE_UTIL_API StartPar
+class ICE_API StartPar
 {
 };
-extern ICE_UTIL_API StartPar spar;
+extern ICE_API StartPar spar;
 
 template<>
 inline Output&
@@ -187,10 +187,10 @@ operator<<(Output& o, const StartPar&)
     return o;
 }
 
-class ICE_UTIL_API EndPar
+class ICE_API EndPar
 {
 };
-extern ICE_UTIL_API EndPar epar;
+extern ICE_API EndPar epar;
 
 template<>
 inline Output&
@@ -200,13 +200,39 @@ operator<<(Output& o, const EndPar&)
     return o;
 }
 
-ICE_UTIL_API Output& operator<<(Output&, std::ios_base& (*)(std::ios_base&));
+class ICE_API StartAbrk
+{
+};
+extern ICE_API StartAbrk sabrk;
+
+template<>
+inline Output&
+operator<<(Output& o, const StartAbrk&)
+{
+    o.spar('<');
+    return o;
+}
+
+class ICE_API EndAbrk
+{
+};
+extern ICE_API EndAbrk eabrk;
+
+template<>
+inline Output&
+operator<<(Output& o, const EndAbrk&)
+{
+    o.epar('>');
+    return o;
+}
+
+ICE_API Output& operator<<(Output&, std::ios_base& (*)(std::ios_base&));
 
 // ----------------------------------------------------------------------
 // XMLOutput
 // ----------------------------------------------------------------------
 
-class ICE_UTIL_API XMLOutput : public OutputBase
+class ICE_API XMLOutput : public OutputBase
 {
 public:
 
@@ -265,10 +291,10 @@ operator<<(XMLOutput& o, const Separator&)
     return o;
 }
 
-class ICE_UTIL_API EndElement
+class ICE_API EndElement
 {
 };
-extern ICE_UTIL_API EndElement ee;
+extern ICE_API EndElement ee;
 
 template<>
 inline XMLOutput&
@@ -278,7 +304,7 @@ operator<<(XMLOutput& o, const EndElement&)
     return o;
 }
 
-class ICE_UTIL_API StartElement
+class ICE_API StartElement
 {
 public:
 
@@ -301,7 +327,7 @@ operator<<(XMLOutput& o, const StartElement& e)
     return o;
 }
 
-class ICE_UTIL_API Attribute
+class ICE_API Attribute
 {
 public:
 
@@ -326,15 +352,15 @@ operator<<(XMLOutput& o, const Attribute& e)
     return o;
 }
 
-class ICE_UTIL_API StartEscapes
+class ICE_API StartEscapes
 {
 };
-extern ICE_UTIL_API StartEscapes startEscapes;
+extern ICE_API StartEscapes startEscapes;
 
-class ICE_UTIL_API EndEscapes
+class ICE_API EndEscapes
 {
 };
-extern ICE_UTIL_API EndEscapes endEscapes;
+extern ICE_API EndEscapes endEscapes;
 
 template<>
 inline XMLOutput&
@@ -352,7 +378,7 @@ operator<<(XMLOutput& o, const EndEscapes&)
     return o;
 }
 
-ICE_UTIL_API XMLOutput& operator<<(XMLOutput&, std::ios_base& (*)(std::ios_base&));
+ICE_API XMLOutput& operator<<(XMLOutput&, std::ios_base& (*)(std::ios_base&));
 
 }