zeroc-ice 3.7.1 → 3.7.6

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Ice/Instance.h>
 #include <Ice/TraceLevels.h>
@@ -56,8 +51,13 @@
 #include <stdio.h>
 #include <list>
 
+#ifdef __APPLE__
+#   include <Ice/OSLogLoggerI.h>
+#endif
+
 #ifndef _WIN32
 #   include <Ice/SysLoggerI.h>
+#   include <Ice/SystemdJournalI.h>
 
 #   include <signal.h>
 #   include <syslog.h>
@@ -65,7 +65,7 @@
 #   include <sys/types.h>
 #endif
 
-#if defined(__linux) || defined(__sun) || defined(_AIX) || defined(__GLIBC__)
+#if defined(__linux__) || defined(__sun) || defined(_AIX) || defined(__GLIBC__)
 #   include <grp.h> // for initgroups
 #endif
 
@@ -950,6 +950,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
     _classGraphDepthMax(0),
     _collectObjects(false),
     _toStringMode(ICE_ENUM(ToStringMode, Unicode)),
+    _acceptClassCycles(false),
     _implicitContext(0),
     _stringConverter(Ice::getProcessStringConverter()),
     _wstringConverter(Ice::getProcessWstringConverter()),
@@ -1037,7 +1038,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
                         throw SyscallException(__FILE__, __LINE__, getSystemErrno());
                     }
 
-                    if(initgroups(pw->pw_name, pw->pw_gid) == -1)
+                    if(initgroups(pw->pw_name, static_cast<int>(pw->pw_gid)) == -1)
                     {
                         throw SyscallException(__FILE__, __LINE__, getSystemErrno());
                     }
@@ -1102,10 +1103,33 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
             }
             else
 #endif
+
+#ifdef ICE_SWIFT
+            if(!_initData.logger && _initData.properties->getPropertyAsInt("Ice.UseOSLog") > 0)
+            {
+                _initData.logger = ICE_MAKE_SHARED(OSLogLoggerI,
+                                                   _initData.properties->getProperty("Ice.ProgramName"));
+            }
+            else
+#endif
+
+#ifdef ICE_USE_SYSTEMD
+            if(_initData.properties->getPropertyAsInt("Ice.UseSystemdJournal") > 0)
+            {
+                _initData.logger = ICE_MAKE_SHARED(SystemdJournalI,
+                                                   _initData.properties->getProperty("Ice.ProgramName"));
+            }
+            else
+#endif
             if(!logfile.empty())
             {
-                _initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"), logfile, true,
-                                                            _initData.properties->getPropertyAsIntWithDefault("Ice.LogFile.SizeMax", 0));
+                Int sz = _initData.properties->getPropertyAsIntWithDefault("Ice.LogFile.SizeMax", 0);
+                if(sz < 0)
+                {
+                    sz = 0;
+                }
+                _initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"),
+                                                   logfile, true, static_cast<size_t>(sz));
             }
             else
             {
@@ -1162,7 +1186,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
             Int num = _initData.properties->getPropertyAsIntWithDefault("Ice.BatchAutoFlushSize", 1024); // 1MB default
             if(num < 1)
             {
-                const_cast<size_t&>(_batchAutoFlushSize) = num;
+                const_cast<size_t&>(_batchAutoFlushSize) = static_cast<size_t>(num);
             }
             else if(static_cast<size_t>(num) > static_cast<size_t>(0x7fffffff / 1024))
             {
@@ -1204,6 +1228,8 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
             throw InitializationException(__FILE__, __LINE__, "The value for Ice.ToStringMode must be Unicode, ASCII or Compat");
         }
 
+        const_cast<bool&>(_acceptClassCycles) = _initData.properties->getPropertyAsInt("Ice.AcceptClassCycles") > 0;
+
         const_cast<ImplicitContextIPtr&>(_implicitContext) =
             ImplicitContextI::create(_initData.properties->getProperty("Ice.ImplicitContext"));
 
@@ -1453,6 +1479,18 @@ IceInternal::Instance::finishSetup(int& argc, const char* argv[], const Ice::Com
     try
     {
         _endpointHostResolver = new EndpointHostResolver(this);
+#ifndef ICE_OS_UWP
+        bool hasPriority = _initData.properties->getProperty("Ice.ThreadPriority") != "";
+        int priority = _initData.properties->getPropertyAsInt("Ice.ThreadPriority");
+        if(hasPriority)
+        {
+            _endpointHostResolver->start(0, priority);
+        }
+        else
+        {
+            _endpointHostResolver->start();
+        }
+#endif
     }
     catch(const IceUtil::Exception& ex)
     {
@@ -1652,8 +1690,15 @@ IceInternal::Instance::destroy()
     }
 #endif
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _objectFactoryMap)
+    {
+        p.second->destroy();
+    }
+#else
     for_each(_objectFactoryMap.begin(), _objectFactoryMap.end(),
         Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
+#endif
     _objectFactoryMap.clear();
 
     if(_routerManager)
@@ -1826,9 +1871,9 @@ IceInternal::Instance::addObjectFactory(const Ice::ObjectFactoryPtr& factory, co
     // with the value factory manager. This may raise AlreadyRegisteredException.
     //
 #ifdef ICE_CPP11_MAPPING
-    _initData.valueFactoryManager->add([factory](const string& id)
+    _initData.valueFactoryManager->add([factory](const string& ident)
                                        {
-                                           return factory->create(id);
+                                           return factory->create(ident);
                                        },
                                        id);
 #else

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef ICE_INSTANCE_H
 #define ICE_INSTANCE_H
@@ -111,6 +106,7 @@ public:
     size_t classGraphDepthMax() const { return _classGraphDepthMax; }
     bool collectObjects() const { return _collectObjects; }
     Ice::ToStringMode toStringMode() const { return _toStringMode; }
+    bool acceptClassCycles() const { return _acceptClassCycles; }
     const ACMConfig& clientACM() const;
     const ACMConfig& serverACM() const;
 
@@ -180,6 +176,7 @@ private:
     const size_t _classGraphDepthMax; // Immutable, not reset by destroy().
     const bool _collectObjects; // Immutable, not reset by destroy().
     const Ice::ToStringMode _toStringMode; // Immutable, not reset by destroy()
+    const bool _acceptClassCycles; // Immutable, not reset by destroy()
     ACMConfig _clientACM;
     ACMConfig _serverACM;
     RouterManagerPtr _routerManager;

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -39,10 +34,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Ice/InstrumentationI.h>
 
@@ -52,7 +47,7 @@ getThreadStateMetric(ThreadState s)
 
 struct ThreadStateChanged
 {
-    ThreadStateChanged(ThreadState oldState, ThreadState newState) : oldState(oldState), newState(newState)
+    ThreadStateChanged(ThreadState oldStateP, ThreadState newStateP) : oldState(oldStateP), newState(newStateP)
     {
     }
 

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

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

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -39,10 +34,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -788,9 +783,15 @@ Ice::InitializationException::InitializationException(const char* file, int line
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::InitializationException::~InitializationException()
+{
+}
+#else
 Ice::InitializationException::~InitializationException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::InitializationException::ice_id() const
@@ -821,9 +822,15 @@ Ice::PluginInitializationException::PluginInitializationException(const char* fi
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::PluginInitializationException::~PluginInitializationException()
+{
+}
+#else
 Ice::PluginInitializationException::~PluginInitializationException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::PluginInitializationException::ice_id() const
@@ -848,9 +855,15 @@ Ice::CollocationOptimizationException::CollocationOptimizationException(const ch
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::CollocationOptimizationException::~CollocationOptimizationException()
+{
+}
+#else
 Ice::CollocationOptimizationException::~CollocationOptimizationException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::CollocationOptimizationException::ice_id() const
@@ -882,9 +895,15 @@ Ice::AlreadyRegisteredException::AlreadyRegisteredException(const char* file, in
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::AlreadyRegisteredException::~AlreadyRegisteredException()
+{
+}
+#else
 Ice::AlreadyRegisteredException::~AlreadyRegisteredException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::AlreadyRegisteredException::ice_id() const
@@ -916,9 +935,15 @@ Ice::NotRegisteredException::NotRegisteredException(const char* file, int line,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::NotRegisteredException::~NotRegisteredException()
+{
+}
+#else
 Ice::NotRegisteredException::~NotRegisteredException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::NotRegisteredException::ice_id() const
@@ -949,9 +974,15 @@ Ice::TwowayOnlyException::TwowayOnlyException(const char* file, int line, const
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::TwowayOnlyException::~TwowayOnlyException()
+{
+}
+#else
 Ice::TwowayOnlyException::~TwowayOnlyException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::TwowayOnlyException::ice_id() const
@@ -976,9 +1007,15 @@ Ice::CloneNotImplementedException::CloneNotImplementedException(const char* file
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::CloneNotImplementedException::~CloneNotImplementedException()
+{
+}
+#else
 Ice::CloneNotImplementedException::~CloneNotImplementedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::CloneNotImplementedException::ice_id() const
@@ -1009,9 +1046,15 @@ Ice::UnknownException::UnknownException(const char* file, int line, const ::std:
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnknownException::~UnknownException()
+{
+}
+#else
 Ice::UnknownException::~UnknownException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnknownException::ice_id() const
@@ -1041,9 +1084,15 @@ Ice::UnknownLocalException::UnknownLocalException(const char* file, int line, co
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnknownLocalException::~UnknownLocalException()
+{
+}
+#else
 Ice::UnknownLocalException::~UnknownLocalException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnknownLocalException::ice_id() const
@@ -1073,9 +1122,15 @@ Ice::UnknownUserException::UnknownUserException(const char* file, int line, cons
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnknownUserException::~UnknownUserException()
+{
+}
+#else
 Ice::UnknownUserException::~UnknownUserException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnknownUserException::ice_id() const
@@ -1100,9 +1155,15 @@ Ice::VersionMismatchException::VersionMismatchException(const char* file, int li
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::VersionMismatchException::~VersionMismatchException()
+{
+}
+#else
 Ice::VersionMismatchException::~VersionMismatchException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::VersionMismatchException::ice_id() const
@@ -1127,9 +1188,15 @@ Ice::CommunicatorDestroyedException::CommunicatorDestroyedException(const char*
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::CommunicatorDestroyedException::~CommunicatorDestroyedException()
+{
+}
+#else
 Ice::CommunicatorDestroyedException::~CommunicatorDestroyedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::CommunicatorDestroyedException::ice_id() const
@@ -1160,9 +1227,15 @@ Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ObjectAdapterDeactivatedException::~ObjectAdapterDeactivatedException()
+{
+}
+#else
 Ice::ObjectAdapterDeactivatedException::~ObjectAdapterDeactivatedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ObjectAdapterDeactivatedException::ice_id() const
@@ -1193,9 +1266,15 @@ Ice::ObjectAdapterIdInUseException::ObjectAdapterIdInUseException(const char* fi
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ObjectAdapterIdInUseException::~ObjectAdapterIdInUseException()
+{
+}
+#else
 Ice::ObjectAdapterIdInUseException::~ObjectAdapterIdInUseException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ObjectAdapterIdInUseException::ice_id() const
@@ -1226,9 +1305,15 @@ Ice::NoEndpointException::NoEndpointException(const char* file, int line, const
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::NoEndpointException::~NoEndpointException()
+{
+}
+#else
 Ice::NoEndpointException::~NoEndpointException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::NoEndpointException::ice_id() const
@@ -1259,9 +1344,15 @@ Ice::EndpointParseException::EndpointParseException(const char* file, int line,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::EndpointParseException::~EndpointParseException()
+{
+}
+#else
 Ice::EndpointParseException::~EndpointParseException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::EndpointParseException::ice_id() const
@@ -1292,9 +1383,15 @@ Ice::EndpointSelectionTypeParseException::EndpointSelectionTypeParseException(co
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::EndpointSelectionTypeParseException::~EndpointSelectionTypeParseException()
+{
+}
+#else
 Ice::EndpointSelectionTypeParseException::~EndpointSelectionTypeParseException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::EndpointSelectionTypeParseException::ice_id() const
@@ -1325,9 +1422,15 @@ Ice::VersionParseException::VersionParseException(const char* file, int line, co
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::VersionParseException::~VersionParseException()
+{
+}
+#else
 Ice::VersionParseException::~VersionParseException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::VersionParseException::ice_id() const
@@ -1358,9 +1461,15 @@ Ice::IdentityParseException::IdentityParseException(const char* file, int line,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::IdentityParseException::~IdentityParseException()
+{
+}
+#else
 Ice::IdentityParseException::~IdentityParseException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::IdentityParseException::ice_id() const
@@ -1391,9 +1500,15 @@ Ice::ProxyParseException::ProxyParseException(const char* file, int line, const
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ProxyParseException::~ProxyParseException()
+{
+}
+#else
 Ice::ProxyParseException::~ProxyParseException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ProxyParseException::ice_id() const
@@ -1424,9 +1539,15 @@ Ice::IllegalIdentityException::IllegalIdentityException(const char* file, int li
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::IllegalIdentityException::~IllegalIdentityException()
+{
+}
+#else
 Ice::IllegalIdentityException::~IllegalIdentityException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::IllegalIdentityException::ice_id() const
@@ -1457,9 +1578,15 @@ Ice::IllegalServantException::IllegalServantException(const char* file, int line
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::IllegalServantException::~IllegalServantException()
+{
+}
+#else
 Ice::IllegalServantException::~IllegalServantException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::IllegalServantException::ice_id() const
@@ -1492,9 +1619,15 @@ Ice::RequestFailedException::RequestFailedException(const char* file, int line,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::RequestFailedException::~RequestFailedException()
+{
+}
+#else
 Ice::RequestFailedException::~RequestFailedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::RequestFailedException::ice_id() const
@@ -1524,9 +1657,15 @@ Ice::ObjectNotExistException::ObjectNotExistException(const char* file, int line
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ObjectNotExistException::~ObjectNotExistException()
+{
+}
+#else
 Ice::ObjectNotExistException::~ObjectNotExistException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ObjectNotExistException::ice_id() const
@@ -1556,9 +1695,15 @@ Ice::FacetNotExistException::FacetNotExistException(const char* file, int line,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::FacetNotExistException::~FacetNotExistException()
+{
+}
+#else
 Ice::FacetNotExistException::~FacetNotExistException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::FacetNotExistException::ice_id() const
@@ -1588,9 +1733,15 @@ Ice::OperationNotExistException::OperationNotExistException(const char* file, in
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::OperationNotExistException::~OperationNotExistException()
+{
+}
+#else
 Ice::OperationNotExistException::~OperationNotExistException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::OperationNotExistException::ice_id() const
@@ -1622,9 +1773,15 @@ Ice::SyscallException::SyscallException(const char* file, int line, Int error) :
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::SyscallException::~SyscallException()
+{
+}
+#else
 Ice::SyscallException::~SyscallException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::SyscallException::ice_id() const
@@ -1654,9 +1811,15 @@ Ice::SocketException::SocketException(const char* file, int line, Int error) :
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::SocketException::~SocketException()
+{
+}
+#else
 Ice::SocketException::~SocketException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::SocketException::ice_id() const
@@ -1687,9 +1850,15 @@ Ice::CFNetworkException::CFNetworkException(const char* file, int line, Int erro
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::CFNetworkException::~CFNetworkException()
+{
+}
+#else
 Ice::CFNetworkException::~CFNetworkException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::CFNetworkException::ice_id() const
@@ -1720,9 +1889,15 @@ Ice::FileException::FileException(const char* file, int line, Int error, const :
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::FileException::~FileException()
+{
+}
+#else
 Ice::FileException::~FileException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::FileException::ice_id() const
@@ -1752,9 +1927,15 @@ Ice::ConnectFailedException::ConnectFailedException(const char* file, int line,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ConnectFailedException::~ConnectFailedException()
+{
+}
+#else
 Ice::ConnectFailedException::~ConnectFailedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ConnectFailedException::ice_id() const
@@ -1784,9 +1965,15 @@ Ice::ConnectionRefusedException::ConnectionRefusedException(const char* file, in
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ConnectionRefusedException::~ConnectionRefusedException()
+{
+}
+#else
 Ice::ConnectionRefusedException::~ConnectionRefusedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ConnectionRefusedException::ice_id() const
@@ -1816,9 +2003,15 @@ Ice::ConnectionLostException::ConnectionLostException(const char* file, int line
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ConnectionLostException::~ConnectionLostException()
+{
+}
+#else
 Ice::ConnectionLostException::~ConnectionLostException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ConnectionLostException::ice_id() const
@@ -1851,9 +2044,15 @@ Ice::DNSException::DNSException(const char* file, int line, Int error, const ::s
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::DNSException::~DNSException()
+{
+}
+#else
 Ice::DNSException::~DNSException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::DNSException::ice_id() const
@@ -1878,9 +2077,15 @@ Ice::OperationInterruptedException::OperationInterruptedException(const char* fi
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::OperationInterruptedException::~OperationInterruptedException()
+{
+}
+#else
 Ice::OperationInterruptedException::~OperationInterruptedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::OperationInterruptedException::ice_id() const
@@ -1905,9 +2110,15 @@ Ice::TimeoutException::TimeoutException(const char* file, int line) :
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::TimeoutException::~TimeoutException()
+{
+}
+#else
 Ice::TimeoutException::~TimeoutException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::TimeoutException::ice_id() const
@@ -1932,9 +2143,15 @@ Ice::ConnectTimeoutException::ConnectTimeoutException(const char* file, int line
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ConnectTimeoutException::~ConnectTimeoutException()
+{
+}
+#else
 Ice::ConnectTimeoutException::~ConnectTimeoutException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ConnectTimeoutException::ice_id() const
@@ -1959,9 +2176,15 @@ Ice::CloseTimeoutException::CloseTimeoutException(const char* file, int line) :
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::CloseTimeoutException::~CloseTimeoutException()
+{
+}
+#else
 Ice::CloseTimeoutException::~CloseTimeoutException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::CloseTimeoutException::ice_id() const
@@ -1986,9 +2209,15 @@ Ice::ConnectionTimeoutException::ConnectionTimeoutException(const char* file, in
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ConnectionTimeoutException::~ConnectionTimeoutException()
+{
+}
+#else
 Ice::ConnectionTimeoutException::~ConnectionTimeoutException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ConnectionTimeoutException::ice_id() const
@@ -2013,9 +2242,15 @@ Ice::InvocationTimeoutException::InvocationTimeoutException(const char* file, in
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::InvocationTimeoutException::~InvocationTimeoutException()
+{
+}
+#else
 Ice::InvocationTimeoutException::~InvocationTimeoutException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::InvocationTimeoutException::ice_id() const
@@ -2040,9 +2275,15 @@ Ice::InvocationCanceledException::InvocationCanceledException(const char* file,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::InvocationCanceledException::~InvocationCanceledException()
+{
+}
+#else
 Ice::InvocationCanceledException::~InvocationCanceledException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::InvocationCanceledException::ice_id() const
@@ -2073,9 +2314,15 @@ Ice::ProtocolException::ProtocolException(const char* file, int line, const ::st
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ProtocolException::~ProtocolException()
+{
+}
+#else
 Ice::ProtocolException::~ProtocolException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ProtocolException::ice_id() const
@@ -2106,9 +2353,15 @@ Ice::BadMagicException::BadMagicException(const char* file, int line, const ::st
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::BadMagicException::~BadMagicException()
+{
+}
+#else
 Ice::BadMagicException::~BadMagicException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::BadMagicException::ice_id() const
@@ -2140,9 +2393,15 @@ Ice::UnsupportedProtocolException::UnsupportedProtocolException(const char* file
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnsupportedProtocolException::~UnsupportedProtocolException()
+{
+}
+#else
 Ice::UnsupportedProtocolException::~UnsupportedProtocolException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnsupportedProtocolException::ice_id() const
@@ -2174,9 +2433,15 @@ Ice::UnsupportedEncodingException::UnsupportedEncodingException(const char* file
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnsupportedEncodingException::~UnsupportedEncodingException()
+{
+}
+#else
 Ice::UnsupportedEncodingException::~UnsupportedEncodingException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnsupportedEncodingException::ice_id() const
@@ -2206,9 +2471,15 @@ Ice::UnknownMessageException::UnknownMessageException(const char* file, int line
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnknownMessageException::~UnknownMessageException()
+{
+}
+#else
 Ice::UnknownMessageException::~UnknownMessageException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnknownMessageException::ice_id() const
@@ -2238,9 +2509,15 @@ Ice::ConnectionNotValidatedException::ConnectionNotValidatedException(const char
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ConnectionNotValidatedException::~ConnectionNotValidatedException()
+{
+}
+#else
 Ice::ConnectionNotValidatedException::~ConnectionNotValidatedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ConnectionNotValidatedException::ice_id() const
@@ -2270,9 +2547,15 @@ Ice::UnknownRequestIdException::UnknownRequestIdException(const char* file, int
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnknownRequestIdException::~UnknownRequestIdException()
+{
+}
+#else
 Ice::UnknownRequestIdException::~UnknownRequestIdException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnknownRequestIdException::ice_id() const
@@ -2302,9 +2585,15 @@ Ice::UnknownReplyStatusException::UnknownReplyStatusException(const char* file,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnknownReplyStatusException::~UnknownReplyStatusException()
+{
+}
+#else
 Ice::UnknownReplyStatusException::~UnknownReplyStatusException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnknownReplyStatusException::ice_id() const
@@ -2334,9 +2623,15 @@ Ice::CloseConnectionException::CloseConnectionException(const char* file, int li
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::CloseConnectionException::~CloseConnectionException()
+{
+}
+#else
 Ice::CloseConnectionException::~CloseConnectionException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::CloseConnectionException::ice_id() const
@@ -2367,9 +2662,15 @@ Ice::ConnectionManuallyClosedException::ConnectionManuallyClosedException(const
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ConnectionManuallyClosedException::~ConnectionManuallyClosedException()
+{
+}
+#else
 Ice::ConnectionManuallyClosedException::~ConnectionManuallyClosedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ConnectionManuallyClosedException::ice_id() const
@@ -2399,9 +2700,15 @@ Ice::IllegalMessageSizeException::IllegalMessageSizeException(const char* file,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::IllegalMessageSizeException::~IllegalMessageSizeException()
+{
+}
+#else
 Ice::IllegalMessageSizeException::~IllegalMessageSizeException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::IllegalMessageSizeException::ice_id() const
@@ -2431,9 +2738,15 @@ Ice::CompressionException::CompressionException(const char* file, int line, cons
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::CompressionException::~CompressionException()
+{
+}
+#else
 Ice::CompressionException::~CompressionException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::CompressionException::ice_id() const
@@ -2463,9 +2776,15 @@ Ice::DatagramLimitException::DatagramLimitException(const char* file, int line,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::DatagramLimitException::~DatagramLimitException()
+{
+}
+#else
 Ice::DatagramLimitException::~DatagramLimitException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::DatagramLimitException::ice_id() const
@@ -2495,9 +2814,15 @@ Ice::MarshalException::MarshalException(const char* file, int line, const ::std:
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::MarshalException::~MarshalException()
+{
+}
+#else
 Ice::MarshalException::~MarshalException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::MarshalException::ice_id() const
@@ -2527,9 +2852,15 @@ Ice::ProxyUnmarshalException::ProxyUnmarshalException(const char* file, int line
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ProxyUnmarshalException::~ProxyUnmarshalException()
+{
+}
+#else
 Ice::ProxyUnmarshalException::~ProxyUnmarshalException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ProxyUnmarshalException::ice_id() const
@@ -2559,9 +2890,15 @@ Ice::UnmarshalOutOfBoundsException::UnmarshalOutOfBoundsException(const char* fi
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnmarshalOutOfBoundsException::~UnmarshalOutOfBoundsException()
+{
+}
+#else
 Ice::UnmarshalOutOfBoundsException::~UnmarshalOutOfBoundsException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnmarshalOutOfBoundsException::ice_id() const
@@ -2592,9 +2929,15 @@ Ice::NoValueFactoryException::NoValueFactoryException(const char* file, int line
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::NoValueFactoryException::~NoValueFactoryException()
+{
+}
+#else
 Ice::NoValueFactoryException::~NoValueFactoryException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::NoValueFactoryException::ice_id() const
@@ -2626,9 +2969,15 @@ Ice::UnexpectedObjectException::UnexpectedObjectException(const char* file, int
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::UnexpectedObjectException::~UnexpectedObjectException()
+{
+}
+#else
 Ice::UnexpectedObjectException::~UnexpectedObjectException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::UnexpectedObjectException::ice_id() const
@@ -2658,9 +3007,15 @@ Ice::MemoryLimitException::MemoryLimitException(const char* file, int line, cons
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::MemoryLimitException::~MemoryLimitException()
+{
+}
+#else
 Ice::MemoryLimitException::~MemoryLimitException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::MemoryLimitException::ice_id() const
@@ -2690,9 +3045,15 @@ Ice::StringConversionException::StringConversionException(const char* file, int
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::StringConversionException::~StringConversionException()
+{
+}
+#else
 Ice::StringConversionException::~StringConversionException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::StringConversionException::ice_id() const
@@ -2722,9 +3083,15 @@ Ice::EncapsulationException::EncapsulationException(const char* file, int line,
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::EncapsulationException::~EncapsulationException()
+{
+}
+#else
 Ice::EncapsulationException::~EncapsulationException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::EncapsulationException::ice_id() const
@@ -2755,9 +3122,15 @@ Ice::FeatureNotSupportedException::FeatureNotSupportedException(const char* file
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::FeatureNotSupportedException::~FeatureNotSupportedException()
+{
+}
+#else
 Ice::FeatureNotSupportedException::~FeatureNotSupportedException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::FeatureNotSupportedException::ice_id() const
@@ -2788,9 +3161,15 @@ Ice::SecurityException::SecurityException(const char* file, int line, const ::st
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::SecurityException::~SecurityException()
+{
+}
+#else
 Ice::SecurityException::~SecurityException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::SecurityException::ice_id() const
@@ -2815,9 +3194,15 @@ Ice::FixedProxyException::FixedProxyException(const char* file, int line) :
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::FixedProxyException::~FixedProxyException()
+{
+}
+#else
 Ice::FixedProxyException::~FixedProxyException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::FixedProxyException::ice_id() const
@@ -2842,9 +3227,15 @@ Ice::ResponseSentException::ResponseSentException(const char* file, int line) :
 {
 }
 
+#ifdef ICE_CPP11_COMPILER
+Ice::ResponseSentException::~ResponseSentException()
+{
+}
+#else
 Ice::ResponseSentException::~ResponseSentException() throw()
 {
 }
+#endif
 
 ::std::string
 Ice::ResponseSentException::ice_id() const