zeroc-ice 3.7.0 → 3.7.1

data/ext/ice/cpp/include/IceUtil/Functional.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/Handle.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/IceUtil.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/InputUtil.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/Iterator.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/Lock.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/Monitor.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/Mutex.h

@@ -1,6 +1,7 @@
+
 // **********************************************************************
 //
-// 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.
@@ -237,11 +238,7 @@ Mutex::init(MutexProtocol
     // Enable mutex error checking in debug builds
     //
 #ifndef NDEBUG
-#if defined(__linux) && !defined(__USE_UNIX98)
-    rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
-#else
     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
-#endif
     assert(rc == 0);
     if(rc != 0)
     {

data/ext/ice/cpp/include/IceUtil/MutexProtocol.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/MutexPtrLock.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/MutexPtrTryLock.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/Optional.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.
@@ -26,8 +26,10 @@ struct NoneType
 namespace IceUtil
 {
 
+/** A sentinel value used to indicate that no optional value was provided. */
 const IceUtilInternal::NoneType None = {};
 
+/** Encapsulates an optional value, which may or may not be present. */
 template<typename T>
 class Optional
 {
@@ -35,19 +37,33 @@ public:
 
     typedef T element_type;
 
+    /**
+     * Constructs an empty optional with no value.
+     */
     Optional() : _isSet(false)
     {
     }
 
+    /**
+     * Constructs an empty optional with no value.
+     */
     Optional(IceUtilInternal::NoneType) : _isSet(false)
     {
     }
 
+    /**
+     * Constructs an optional with the given value.
+     * @param p The initial value.
+     */
     template<typename Y>
     Optional(Y p) : _value(p), _isSet(true)
     {
     }
 
+    /**
+     * Constructs an optional as a copy of the given optional.
+     * @param r The source optional.
+     */
     template<typename Y>
     Optional(const Optional<Y>& r) : _value(r._value), _isSet(r._isSet)
     {
@@ -57,6 +73,9 @@ public:
     {
     }
 
+    /**
+     * Resets this optional to have no value.
+     */
     Optional& operator=(IceUtilInternal::NoneType)
     {
         _value = T();
@@ -64,6 +83,10 @@ public:
         return *this;
     }
 
+    /**
+     * Resets this optional to have the given value.
+     * @param p The new value.
+     */
     template<typename Y>
     Optional& operator=(Y p)
     {
@@ -72,6 +95,10 @@ public:
         return *this;
     }
 
+    /**
+     * Resets this optional to be a copy of the given optional.
+     * @param r The source optional.
+     */
     template<typename Y>
     Optional& operator=(const Optional<Y>& r)
     {
@@ -80,6 +107,10 @@ public:
         return *this;
     }
 
+    /**
+     * Resets this optional to be a copy of the given optional.
+     * @param r The source optional.
+     */
     Optional& operator=(const Optional& r)
     {
         _value = r._value;
@@ -87,66 +118,122 @@ public:
         return *this;
     }
 
+    /**
+     * Obtains the current value.
+     * @return The current value.
+     * @throws OptionalNotSetException if this optional has no value.
+     */
     const T& value() const
     {
         checkIsSet();
         return _value;
     }
 
+    /**
+     * Obtains the current value.
+     * @return The current value.
+     * @throws OptionalNotSetException if this optional has no value.
+     */
     T& value()
     {
         checkIsSet();
         return _value;
     }
 
+    /**
+     * Obtains the current value.
+     * @return The current value.
+     * @throws OptionalNotSetException if this optional has no value.
+     */
     const T& get() const
     {
         return value();
     }
 
+    /**
+     * Obtains the current value.
+     * @return The current value.
+     * @throws OptionalNotSetException if this optional has no value.
+     */
     T& get()
     {
         return value();
     }
 
+    /**
+     * Obtains a pointer to the current value.
+     * @return A pointer to the current value.
+     * @throws OptionalNotSetException if this optional has no value.
+     */
     const T* operator->() const
     {
         return &value();
     }
+
+    /**
+     * Obtains a pointer to the current value.
+     * @return A pointer to the current value.
+     * @throws OptionalNotSetException if this optional has no value.
+     */
     T* operator->()
     {
         return &value();
     }
 
+    /**
+     * Obtains the current value.
+     * @return The current value.
+     * @throws OptionalNotSetException if this optional has no value.
+     */
     const T& operator*() const
     {
         return value();
     }
+
+    /**
+     * Obtains the current value.
+     * @return The current value.
+     * @throws OptionalNotSetException if this optional has no value.
+     */
     T& operator*()
     {
         return value();
     }
 
+    /**
+     * Determines whether this optional has a value.
+     * @return True if the optional has a value, false otherwise.
+     */
     operator bool() const
     {
         return _isSet;
     }
 
+    /**
+     * Determines whether this optional has a value.
+     * @return True if the optional does not have a value, false otherwise.
+     */
     bool operator!() const
     {
         return !_isSet;
     }
 
+    /**
+     * Exchanges the state of this optional with another one.
+     * @param other The optional value with which to swap.
+     */
     void swap(Optional& other)
     {
         std::swap(_isSet, other._isSet);
         std::swap(_value, other._value);
     }
 
+    /// \cond INTERNAL
     void __setIsSet()
     {
         _isSet = true;
     }
+    /// \endcond
 
 private:
 
@@ -164,17 +251,24 @@ private:
     bool _isSet;
 };
 
+/**
+ * Constructs an optional from the given value.
+ * @param v The optional's initial value.
+ * @return A new optional object.
+ */
 template<class T> inline Optional<T>
 makeOptional(const T& v)
 {
     return Optional<T>(v);
 }
 
+/// \cond INTERNAL
 template<typename T> inline void
 Optional<T>::throwOptionalNotSetException(const char* file, int line) const
 {
     throw OptionalNotSetException(file, line);
 }
+/// \endcond
 
 template<typename T, typename U>
 inline bool operator==(const Optional<T>& lhs, const Optional<U>& rhs)

data/ext/ice/cpp/include/IceUtil/Options.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/OutputUtil.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/PopDisableWarnings.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/PushDisableWarnings.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/Random.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/RecMutex.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/ResourceConfig.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.
@@ -12,11 +12,11 @@
 
 #include "winver.h"
 
-#define ICE_VERSION 3,7,0,0
-#define ICE_STRING_VERSION "3.7.0\0"
+#define ICE_VERSION 3,7,1,0
+#define ICE_STRING_VERSION "3.7.1\0"
 #define ICE_SO_VERSION "37\0"
 #define ICE_COMPANY_NAME "ZeroC, Inc.\0"
-#define ICE_COPYRIGHT "\251 2003-2017 ZeroC, Inc.\0"
+#define ICE_COPYRIGHT "\251 2003-2018 ZeroC, Inc.\0"
 #define ICE_PRODUCT_NAME "Ice\0"
 
 #ifdef ICE_CPP11_MAPPING

data/ext/ice/cpp/include/IceUtil/ScannerConfig.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.
@@ -26,11 +26,13 @@
 #endif
 
 //
-// Clang++ >= 5.1  deprecate 'register' storage class specifier
-// used by lex generated Scanners.
+// Clang++ >= 5.1 and VC++ using C++17 standard deprecate 'register' storage
+// class specifier used by lex generated Scanners.
 //
 #if defined(__clang__)
 #   pragma clang diagnostic ignored "-Wdeprecated-register"
+#elif defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(disable:5033)
 #endif
 
 #endif