zeroc-ice 3.7.0 → 3.7.1

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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,25 +20,33 @@
 namespace IceUtil
 {
 
-//
-// Provides bytes to toUTF8. Can raise std::bad_alloc or Ice::MemoryLimitException
-// when too many bytes are requested.
-//
+/**
+ * Provides bytes to toUTF8. Can raise std::bad_alloc or Ice::MemoryLimitException
+ * when too many bytes are requested.
+ * \headerfile Ice/Ice.h
+ */
 class ICE_API UTF8Buffer
 {
 public:
+
+    /**
+     * Obtains more bytes.
+     * @param howMany The number of bytes requested.
+     * @param firstUnused A pointer to the first unused byte.
+     * @return A pointer to the beginning of the buffer.
+     */
     virtual Byte* getMoreBytes(size_t howMany, Byte* firstUnused) = 0;
 
     virtual ~UTF8Buffer();
 };
 
-//
-// A StringConverter converts narrow or wide-strings to and from UTF-8 byte sequences.
-// It's used by the communicator during marshaling (toUTF8) and unmarshaling (fromUTF8).
-// It report errors by raising IllegalConversionException or an exception raised
-// by UTF8Buffer
-//
-
+/**
+ * A StringConverter converts narrow or wide-strings to and from UTF-8 byte sequences.
+ * It's used by the communicator during marshaling (toUTF8) and unmarshaling (fromUTF8).
+ * It report errors by raising IllegalConversionException or an exception raised
+ * by UTF8Buffer.
+ * \headerfile Ice/Ice.h
+ */
 template<typename charT>
 class BasicStringConverter
 #ifndef ICE_CPP11_MAPPING
@@ -46,18 +54,17 @@ class BasicStringConverter
 #endif
 {
 public:
-    //
-    // Returns a pointer to byte after the last written byte (which may be
-    // past the last byte returned by getMoreBytes).
-    //
-    virtual Byte* toUTF8(const charT* sourceStart, const charT* sourceEnd,
-                         UTF8Buffer&) const = 0;
-
-    //
-    // Unmarshals a UTF-8 sequence into a basic_string
-    //
-    virtual void fromUTF8(const Byte* sourceStart, const Byte* sourceEnd,
-                          std::basic_string<charT>& target) const = 0;
+
+    /**
+     * Returns a pointer to byte after the last written byte (which may be
+     * past the last byte returned by getMoreBytes).
+     */
+    virtual Byte* toUTF8(const charT* sourceStart, const charT* sourceEnd, UTF8Buffer& buf) const = 0;
+
+    /**
+     * Unmarshals a UTF-8 sequence into a basic_string.
+     */
+    virtual void fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, std::basic_string<charT>& target) const = 0;
 
     virtual ~BasicStringConverter()
     {
@@ -73,85 +80,95 @@ template class ICE_API BasicStringConverter<char>;
 template class ICE_API BasicStringConverter<wchar_t>;
 #endif
 
+/** A narrow string converter. */
 typedef BasicStringConverter<char> StringConverter;
 ICE_DEFINE_PTR(StringConverterPtr, StringConverter);
 
+/** A wide string converter. */
 typedef BasicStringConverter<wchar_t> WstringConverter;
 ICE_DEFINE_PTR(WstringConverterPtr, WstringConverter);
 
-//
-// Create a WstringConverter that converts to and from UTF-16 or UTF-32
-// depending on sizeof(wchar_t).
-//
-//
+/**
+ * Creates a WstringConverter that converts to and from UTF-16 or UTF-32 depending on sizeof(wchar_t).
+ * @return The string converter.
+ */
 ICE_API WstringConverterPtr createUnicodeWstringConverter();
 
-//
-// Retrieve the per process narrow string converter.
-//
+/**
+ * Retrieves the per-process narrow string converter.
+ * @return The string converter.
+ */
 ICE_API StringConverterPtr getProcessStringConverter();
 
-//
-// Set the per process narrow string converter.
-//
-ICE_API void setProcessStringConverter(const StringConverterPtr&);
+/**
+ * Sets the per-process narrow string converter.
+ * @param c The string converter.
+ */
+ICE_API void setProcessStringConverter(const StringConverterPtr& c);
 
-//
-// Retrieve the per process wide string converter.
-//
+/**
+ * Retrieves the per-process wide string converter.
+ * @return The string converter.
+ */
 ICE_API WstringConverterPtr getProcessWstringConverter();
 
-//
-// Set the per process wide string converter.
-//
-ICE_API void setProcessWstringConverter(const WstringConverterPtr&);
-
-//
-// Converts the given wide string to a narrow string
-//
-// If the StringConverter parameter is null, the result's narrow
-// string encoding is UTF-8.
-// If the WstringConverter parameter is null, the input's wstring
-// encoding is UTF-16 or UTF-32 depending on the size of wchar_t.
-//
+/**
+ * Sets the per process wide string converter.
+ * @param c The string converter.
+ */
+ICE_API void setProcessWstringConverter(const WstringConverterPtr& c);
+
+/**
+ * Converts the given wide string to a narrow string.
+ * @param str A wide string.
+ * @param nc The narrow string converter. If null, the result's narrow string encoding is UTF-8.
+ * @param wc The wide string converter. If null, the input's wstring encoding is UTF-16 or UTF-32
+ * depending on the size of wchar_t.
+ * @return A narrow string.
+ */
 ICE_API std::string
-wstringToString(const std::wstring&,
-                const StringConverterPtr& = 0,
-                const WstringConverterPtr& = 0);
-
-//
-// Converts the given narrow string to a wide string
-//
-// If the StringConverter parameter is null, the input's narrow string
-// encoding is UTF-8.
-// If the WstringConverter parameter is null, the result's wstring
-// encoding is UTF-16 or UTF-32 depending on the size of wchar_t.
-//
+wstringToString(const std::wstring& str,
+                const StringConverterPtr& nc = 0,
+                const WstringConverterPtr& wc = 0);
+
+/**
+ * Converts the given narrow string to a wide string.
+ * @param str A narrow string.
+ * @param nc The narrow string converter. If null, the result's narrow string encoding is UTF-8.
+ * @param wc The wide string converter. If null, the input's wstring encoding is UTF-16 or UTF-32
+ * depending on the size of wchar_t.
+ * @return A wide string.
+ */
 ICE_API std::wstring
-stringToWstring(const std::string&,
-                const StringConverterPtr& = 0,
-                const WstringConverterPtr& = 0);
-
-//
-// Converts the given string from the native narrow string encoding to
-// UTF-8 using the given converter. If the converter is null, returns
-// the given string.
-//
+stringToWstring(const std::string& str,
+                const StringConverterPtr& nc = 0,
+                const WstringConverterPtr& wc = 0);
+
+/**
+ * Converts the given string from the native narrow string encoding to
+ * UTF-8 using the given converter.
+ * @param str The native narrow string.
+ * @param nc The narrow string converter. If null, the native string is returned.
+ * @return A UTF-8 string.
+ */
 ICE_API std::string
-nativeToUTF8(const std::string&, const StringConverterPtr&);
-
-//
-// Converts the given string from UTF-8 to the native narrow string
-// encoding using the given converter. If the converter is null,
-// returns the given string.
-//
+nativeToUTF8(const std::string& str, const StringConverterPtr& nc);
+
+/**
+ * Converts the given string from UTF-8 to the native narrow string
+ * encoding using the given converter.
+ * @param str The UTF-8 string.
+ * @param nc The narrow string converter. If null, the UTF-8 string is returned.
+ * @return A native narrow string.
+ */
 ICE_API std::string
-UTF8ToNative(const std::string&, const StringConverterPtr&);
+UTF8ToNative(const std::string& str, const StringConverterPtr& nc);
 
 }
 
 namespace IceUtilInternal
 {
+
 //
 // Convert from UTF-8 to UTF-16/32
 //
@@ -168,11 +185,14 @@ ICE_API std::vector<IceUtil::Byte> fromUTF32(const std::vector<unsigned int>&);
 #ifdef _WIN32
 namespace IceUtil
 {
-//
-// Create a StringConverter that converts to and from narrow chars
-// in the given code page, using MultiByteToWideChar and WideCharToMultiByte
-//
-ICE_API StringConverterPtr createWindowsStringConverter(unsigned int);
+
+/**
+ * Creates a StringConverter that converts to and from narrow chars
+ * in the given code page, using MultiByteToWideChar and WideCharToMultiByte.
+ * @param page The code page.
+ * @return The string converter.
+ */
+ICE_API StringConverterPtr createWindowsStringConverter(unsigned int page);
 
 }
 #endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -104,7 +104,11 @@ protected:
     bool _destroyed;
     std::set<Token> _tokens;
 
+#if (ICE_CPLUSPLUS >= 201703L)
+    class TimerTaskCompare
+#else
     class TimerTaskCompare : public std::binary_function<TimerTaskPtr, TimerTaskPtr, bool>
+#endif
     {
     public:
 

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
@@ -15,6 +15,10 @@
 namespace IceUtil
 {
 
+/**
+ * Generates a universally unique identifier (UUID).
+ * @return The UUID.
+ */
 ICE_API std::string generateUUID();
 
 }

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.

data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2018 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.
 //
 // **********************************************************************
 //
-// Ice version 3.7.0
+// Ice version 3.7.1
 //
 // <auto-generated>
 //
@@ -40,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -60,25 +60,55 @@
 namespace Ice
 {
 
+/**
+ * A sequence of bools.
+ */
 using BoolSeq = ::std::vector<bool>;
 
-using ByteSeq = ::std::vector<::Ice::Byte>;
+/**
+ * A sequence of bytes.
+ */
+using ByteSeq = ::std::vector<Byte>;
 
+/**
+ * A sequence of shorts.
+ */
 using ShortSeq = ::std::vector<short>;
 
+/**
+ * A sequence of ints.
+ */
 using IntSeq = ::std::vector<int>;
 
+/**
+ * A sequence of longs.
+ */
 using LongSeq = ::std::vector<long long int>;
 
+/**
+ * A sequence of floats.
+ */
 using FloatSeq = ::std::vector<float>;
 
+/**
+ * A sequence of doubles.
+ */
 using DoubleSeq = ::std::vector<double>;
 
+/**
+ * A sequence of strings.
+ */
 using StringSeq = ::std::vector<::std::string>;
 
-using ObjectSeq = ::std::vector<::std::shared_ptr<::Ice::Value>>;
+/**
+ * A sequence of objects.
+ */
+using ObjectSeq = ::std::vector<::std::shared_ptr<Value>>;
 
-using ObjectProxySeq = ::std::vector<::std::shared_ptr<::Ice::ObjectPrx>>;
+/**
+ * A sequence of object proxies.
+ */
+using ObjectProxySeq = ::std::vector<::std::shared_ptr<ObjectPrx>>;
 
 }
 
@@ -87,25 +117,55 @@ using ObjectProxySeq = ::std::vector<::std::shared_ptr<::Ice::ObjectPrx>>;
 namespace Ice
 {
 
+/**
+ * A sequence of bools.
+ */
 typedef ::std::vector<bool> BoolSeq;
 
-typedef ::std::vector< ::Ice::Byte> ByteSeq;
-
-typedef ::std::vector< ::Ice::Short> ShortSeq;
-
-typedef ::std::vector< ::Ice::Int> IntSeq;
-
-typedef ::std::vector< ::Ice::Long> LongSeq;
-
-typedef ::std::vector< ::Ice::Float> FloatSeq;
-
-typedef ::std::vector< ::Ice::Double> DoubleSeq;
-
+/**
+ * A sequence of bytes.
+ */
+typedef ::std::vector<Ice::Byte> ByteSeq;
+
+/**
+ * A sequence of shorts.
+ */
+typedef ::std::vector<Ice::Short> ShortSeq;
+
+/**
+ * A sequence of ints.
+ */
+typedef ::std::vector<Ice::Int> IntSeq;
+
+/**
+ * A sequence of longs.
+ */
+typedef ::std::vector<Ice::Long> LongSeq;
+
+/**
+ * A sequence of floats.
+ */
+typedef ::std::vector<Ice::Float> FloatSeq;
+
+/**
+ * A sequence of doubles.
+ */
+typedef ::std::vector<Ice::Double> DoubleSeq;
+
+/**
+ * A sequence of strings.
+ */
 typedef ::std::vector< ::std::string> StringSeq;
 
-typedef ::std::vector< ::Ice::ObjectPtr> ObjectSeq;
+/**
+ * A sequence of objects.
+ */
+typedef ::std::vector<Ice::ObjectPtr> ObjectSeq;
 
-typedef ::std::vector< ::Ice::ObjectPrx> ObjectProxySeq;
+/**
+ * A sequence of object proxies.
+ */
+typedef ::std::vector<Ice::ObjectPrx> ObjectProxySeq;
 
 }