zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/src/Ice/ConnectorF.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.

data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp

@@ -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.
@@ -15,11 +15,11 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) :
 {
     if(count < 0)
     {
-        throw IceUtil::Exception(__FILE__, __LINE__);
+        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "count must be greather than 0");
     }
 
 #ifdef _WIN32
-#   ifndef ICE_OS_WINRT
+#   ifndef ICE_OS_UWP
     _event = CreateEvent(0, TRUE, FALSE, 0);
 #   else
     _event = CreateEventExW(0, 0,  CREATE_EVENT_MANUAL_RESET, SEMAPHORE_ALL_ACCESS);
@@ -66,7 +66,7 @@ IceUtilInternal::CountDownLatch::await() const
 #ifdef _WIN32
     while(InterlockedExchangeAdd(&_count, 0) > 0)
     {
-#   ifndef ICE_OS_WINRT
+#   ifndef ICE_OS_UWP
         DWORD rc = WaitForSingleObject(_event, INFINITE);
 #   else
         DWORD rc = WaitForSingleObjectEx(_event, INFINITE, false);

data/ext/ice/cpp/src/Ice/Current.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -23,22 +23,45 @@
 #endif
 #include <Ice/Current.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace
+{
+
+}
+
 namespace Ice
 {
 }
+
+#else // C++98 mapping
+
+namespace Ice
+{
+}
+
+#endif

data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp

@@ -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.
@@ -36,7 +36,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
 
     string value;
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     value = properties->getProperty("Ice.Default.SourceAddress");
     if(!value.empty())
     {
@@ -112,11 +112,11 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
     value = properties->getPropertyWithDefault("Ice.Default.EndpointSelection", "Random");
     if(value == "Random")
     {
-        defaultEndpointSelection = Random;
+        defaultEndpointSelection = ICE_ENUM(EndpointSelectionType, Random);
     }
     else if(value == "Ordered")
     {
-        defaultEndpointSelection = Ordered;
+        defaultEndpointSelection = ICE_ENUM(EndpointSelectionType, Ordered);
     }
     else
     {
@@ -163,5 +163,6 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
     checkSupportedEncoding(defaultEncoding);
 
     bool slicedFormat = properties->getPropertyAsIntWithDefault("Ice.Default.SlicedFormat", 0) > 0;
-    const_cast<FormatType&>(defaultFormat) = slicedFormat ? SlicedFormat : CompactFormat;
+    const_cast<FormatType&>(defaultFormat) = slicedFormat ?
+        ICE_ENUM(FormatType, SlicedFormat) : ICE_ENUM(FormatType, CompactFormat);
 }

data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h

@@ -1,7 +1,7 @@
 
 // **********************************************************************
 //
-// 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.

data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.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.

data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp

@@ -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.
@@ -14,36 +14,16 @@
 using namespace Ice;
 using namespace IceInternal;
 
-DispatchStatus
-Ice::DispatchInterceptor::__dispatch(IceInternal::Incoming& in, const Current& /*current*/)
+bool
+Ice::DispatchInterceptor::_iceDispatch(IceInternal::Incoming& in, const Current& /*current*/)
 {
     try
     {
         IncomingRequest request(in);
-        DispatchStatus status = dispatch(request);
-        if(status != DispatchAsync)
-        {
-            //
-            // Make sure 'in' owns the connection etc.
-            //
-            in.killAsync();
-        }
-        return status;
+        return dispatch(request);
     }
     catch(const ResponseSentException&)
     {
-        return DispatchAsync;
-    }
-    catch(...)
-    {
-        try
-        {
-            in.killAsync();
-        }
-        catch(const ResponseSentException&)
-        {
-            return DispatchAsync;
-        }
-        throw;
+        return false;
     }
 }

data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp

@@ -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.
@@ -9,7 +9,7 @@
 
 #include <Ice/DynamicLibrary.h>
 #include <IceUtil/StringUtil.h>
-#include <IceUtil/StringConverter.h>
+#include <Ice/StringConverter.h>
 
 #ifndef _WIN32
 #   include <dlfcn.h>
@@ -93,24 +93,23 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
     if(comma == string::npos)
     {
         libName = libSpec;
-#  ifdef ICE_LIBSUFFIX
-        libName += ICE_LIBSUFFIX;
+#  if defined(ICE_CPP11_MAPPING) && !defined(_WIN32)
+        libName += "++11";
 #  endif
         if(useIceVersion)
         {
             int majorVersion = (ICE_INT_VERSION / 10000);
             int minorVersion = (ICE_INT_VERSION / 100) - majorVersion * 100;
+            int patchVersion = ICE_INT_VERSION % 100;
             ostringstream os;
             os << majorVersion * 10 + minorVersion;
-
-            int patchVersion = ICE_INT_VERSION % 100;
-            if(patchVersion > 50)
+            if(patchVersion >= 60)
             {
-                os << 'b';
-                if(patchVersion >= 52)
-                {
-                    os << (patchVersion - 50);
-                }
+                os << 'b' << (patchVersion - 60);
+            }
+            else if(patchVersion >= 50)
+            {
+                os << 'a' << (patchVersion - 50);
             }
             version = os.str();
         }
@@ -123,9 +122,9 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
             return 0;
         }
         libName = libSpec.substr(0, comma);
-#ifdef ICE_LIBSUFFIX
-        libName += ICE_LIBSUFFIX;
-#endif
+#  if defined(ICE_CPP11_MAPPING) && !defined(_WIN32)
+        libName += "++11";
+#  endif
         version = libSpec.substr(comma + 1);
     }
 
@@ -134,6 +133,13 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
 #ifdef _WIN32
     lib += libName;
     lib += version;
+#  ifdef ICE_OS_UWP
+    lib += "uwp";
+#  endif
+
+#  ifdef ICE_CPP11_MAPPING
+    lib += "++11";
+#  endif
 
 #   if defined(_DEBUG) && !defined(__MINGW32__)
     lib += 'd';
@@ -211,10 +217,10 @@ IceInternal::DynamicLibrary::load(const string& lib)
     // Don't need to use a wide string converter as the wide string is passed
     // to Windows API.
     //
-#ifdef ICE_OS_WINRT
-    _hnd = LoadPackagedLibrary(IceUtil::stringToWstring(lib, IceUtil::getProcessStringConverter()).c_str(), 0);
+#ifdef ICE_OS_UWP
+    _hnd = LoadPackagedLibrary(stringToWstring(lib, getProcessStringConverter()).c_str(), 0);
 #elif defined(_WIN32)
-    _hnd = LoadLibraryW(IceUtil::stringToWstring(lib, IceUtil::getProcessStringConverter()).c_str());
+    _hnd = LoadLibraryW(stringToWstring(lib, getProcessStringConverter()).c_str());
 #else
 
     int flags = RTLD_NOW | RTLD_GLOBAL;
@@ -277,9 +283,13 @@ IceInternal::DynamicLibrary::getErrorMessage() const
     return _err;
 }
 
+IceInternal::DynamicLibraryList::~DynamicLibraryList()
+{
+    // Out of line to avoid weak vtable
+}
+
 void
 IceInternal::DynamicLibraryList::add(const DynamicLibraryPtr& library)
 {
     _libraries.push_back(library);
 }
-

data/ext/ice/cpp/src/Ice/Endpoint.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -23,37 +23,116 @@
 #endif
 #include <Ice/Endpoint.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
 #include <IceUtil/PopDisableWarnings.h>
 
+#if defined(_MSC_VER)
+#   pragma warning(disable:4458) // declaration of ... hides class member
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace
+{
+
+}
+
+Ice::EndpointInfo::~EndpointInfo()
+{
+}
+
+Ice::Endpoint::~Endpoint()
+{
+}
+
+Ice::IPEndpointInfo::~IPEndpointInfo()
+{
+}
+
+Ice::TCPEndpointInfo::~TCPEndpointInfo()
+{
+}
+
+Ice::UDPEndpointInfo::~UDPEndpointInfo()
+{
+}
+
+Ice::WSEndpointInfo::~WSEndpointInfo()
+{
+}
+
+Ice::OpaqueEndpointInfo::~OpaqueEndpointInfo()
+{
+}
+
+#else // C++98 mapping
+
 namespace
 {
 
 }
 
+Ice::EndpointInfo::~EndpointInfo()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::EndpointInfo* p) { return p; }
 
+Ice::Endpoint::~Endpoint()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Endpoint* p) { return p; }
 
+Ice::IPEndpointInfo::~IPEndpointInfo()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::IPEndpointInfo* p) { return p; }
 
+Ice::TCPEndpointInfo::~TCPEndpointInfo()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::TCPEndpointInfo* p) { return p; }
 
+Ice::UDPEndpointInfo::~UDPEndpointInfo()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::UDPEndpointInfo* p) { return p; }
 
+Ice::WSEndpointInfo::~WSEndpointInfo()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::WSEndpointInfo* p) { return p; }
 
+Ice::OpaqueEndpointInfo::~OpaqueEndpointInfo()
+{
+}
+
 ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::OpaqueEndpointInfo* p) { return p; }
+
+namespace Ice
+{
+}
+
+#endif