zeroc-ice 3.7.0 → 3.7.1

data/ext/ice/cpp/src/Ice/ObjectAdapterI.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.
@@ -47,16 +47,16 @@ class ObjectAdapterI : public ObjectAdapter,
 {
 public:
 
-    virtual std::string getName() const;
+    virtual std::string getName() const ICE_NOEXCEPT;
 
-    virtual CommunicatorPtr getCommunicator() const;
+    virtual CommunicatorPtr getCommunicator() const ICE_NOEXCEPT;
 
     virtual void activate();
     virtual void hold();
     virtual void waitForHold();
-    virtual void deactivate();
-    virtual void waitForDeactivate();
-    virtual bool isDeactivated() const;
+    virtual void deactivate() ICE_NOEXCEPT;
+    virtual void waitForDeactivate() ICE_NOEXCEPT;
+    virtual bool isDeactivated() const ICE_NOEXCEPT;
     virtual void destroy() ICE_NOEXCEPT;
 
     virtual ObjectPrxPtr add(const ObjectPtr&, const Identity&);
@@ -83,11 +83,11 @@ public:
     virtual ObjectPrxPtr createIndirectProxy(const Identity&) const;
 
     virtual void setLocator(const LocatorPrxPtr&);
-    virtual Ice::LocatorPrxPtr getLocator() const;
-    virtual EndpointSeq getEndpoints() const;
+    virtual Ice::LocatorPrxPtr getLocator() const ICE_NOEXCEPT;
+    virtual EndpointSeq getEndpoints() const ICE_NOEXCEPT;
 
     virtual void refreshPublishedEndpoints();
-    virtual EndpointSeq getPublishedEndpoints() const;
+    virtual EndpointSeq getPublishedEndpoints() const ICE_NOEXCEPT;
     virtual void setPublishedEndpoints(const EndpointSeq&);
 
     bool isLocal(const ObjectPrxPtr&) const;
@@ -103,6 +103,7 @@ public:
     IceInternal::ThreadPoolPtr getThreadPool() const;
     IceInternal::ServantManagerPtr getServantManager() const;
     IceInternal::ACMConfig getACM() const;
+    void setAdapterOnConnection(const Ice::ConnectionIPtr&);
     size_t messageSizeMax() const { return _messageSizeMax; }
 
     ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&,
@@ -119,7 +120,7 @@ private:
     ObjectPrxPtr newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
     void checkForDeactivation() const;
     std::vector<IceInternal::EndpointIPtr> parseEndpoints(const std::string&, bool) const;
-    std::vector<IceInternal::EndpointIPtr> parsePublishedEndpoints();
+    std::vector<IceInternal::EndpointIPtr> computePublishedEndpoints();
     void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrxPtr&);
     bool filterProperties(Ice::StringSeq&);
 
@@ -146,7 +147,6 @@ private:
     const std::string _replicaGroupId;
     IceInternal::ReferencePtr _reference;
     std::vector<IceInternal::IncomingConnectionFactoryPtr> _incomingConnectionFactories;
-    std::vector<IceInternal::EndpointIPtr> _routerEndpoints;
     IceInternal::RouterInfoPtr _routerInfo;
     std::vector<IceInternal::EndpointIPtr> _publishedEndpoints;
     IceInternal::LocatorInfoPtr _locatorInfo;

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

@@ -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>
 //
@@ -42,7 +42,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
@@ -69,7 +69,9 @@ Ice::ObjectFactory::~ObjectFactory()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ObjectFactory* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(ObjectFactory* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

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

@@ -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/src/Ice/OpaqueEndpointI.cpp

@@ -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.
@@ -35,15 +35,11 @@ IceInternal::OpaqueEndpointI::OpaqueEndpointI(vector<string>& args) :
 
     if(_type < 0)
     {
-        EndpointParseException ex(__FILE__, __LINE__);
-        ex.str = "no -t option in endpoint " + toString();
-        throw ex;
+        throw EndpointParseException(__FILE__, __LINE__, "no -t option in endpoint " + toString());
     }
     if(_rawBytes.empty())
     {
-        EndpointParseException ex(__FILE__, __LINE__);
-        ex.str = "no -v option in endpoint " + toString();
-        throw ex;
+        throw EndpointParseException(__FILE__, __LINE__, "no -v option in endpoint " + toString());
     }
 }
 
@@ -64,19 +60,19 @@ public:
     OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVersion& rawEncoding, const Ice::ByteSeq& rawByes);
 
     virtual Ice::Short
-    type() const
+    type() const ICE_NOEXCEPT
     {
         return _type;
     }
 
     virtual bool
-    datagram() const
+    datagram() const ICE_NOEXCEPT
     {
         return false;
     }
 
     virtual bool
-    secure() const
+    secure() const ICE_NOEXCEPT
     {
         return false;
     }
@@ -106,7 +102,7 @@ IceInternal::OpaqueEndpointI::streamWrite(OutputStream* s) const
 }
 
 Ice::EndpointInfoPtr
-IceInternal::OpaqueEndpointI::getInfo() const
+IceInternal::OpaqueEndpointI::getInfo() const ICE_NOEXCEPT
 {
     return ICE_MAKE_SHARED(OpaqueEndpointInfoI, _type, _rawEncoding, _rawBytes);
 }
@@ -342,29 +338,24 @@ IceInternal::OpaqueEndpointI::checkOption(const string& option, const string& ar
     {
         if(_type > -1)
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "multiple -t options in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "multiple -t options in endpoint " + endpoint);
         }
         if(argument.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for -t option in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "no argument provided for -t option in endpoint " +
+                                         endpoint);
         }
         istringstream p(argument);
         Ice::Int t;
         if(!(p >> t) || !p.eof())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid type value `" + argument + "' in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "invalid type value `" + argument + "' in endpoint " +
+                                         endpoint);
         }
         else if(t < 0 || t > 65535)
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "type value `" + argument + "' out of range in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "type value `" + argument + "' out of range in endpoint " +
+                                         endpoint);
         }
         _type = static_cast<Ice::Short>(t);
         return true;
@@ -374,26 +365,20 @@ IceInternal::OpaqueEndpointI::checkOption(const string& option, const string& ar
     {
         if(!_rawBytes.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "multiple -v options in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "multiple -v options in endpoint " + endpoint);
         }
         if(argument.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for -v option in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "no argument provided for -v option in endpoint " + endpoint);
         }
         for(string::size_type i = 0; i < argument.size(); ++i)
         {
             if(!Base64::isBase64(argument[i]))
             {
-                EndpointParseException ex(__FILE__, __LINE__);
-                ostringstream ostr;
-                ostr << "invalid base64 character `" << argument[i] << "' (ordinal " << static_cast<int>(argument[i])
-                     << ") in endpoint " << endpoint;
-                ex.str = ostr.str();
-                throw ex;
+                ostringstream os;
+                os << "invalid base64 character `" << argument[i] << "' (ordinal " << static_cast<int>(argument[i])
+                   << ") in endpoint " << endpoint;
+                throw EndpointParseException(__FILE__, __LINE__, os.str());
             }
         }
         const_cast<vector<Byte>&>(_rawBytes) = Base64::decode(argument);
@@ -404,20 +389,18 @@ IceInternal::OpaqueEndpointI::checkOption(const string& option, const string& ar
     {
         if(argument.empty())
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for -e option in endpoint " + endpoint;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "no argument provided for -e option in endpoint " +
+                                              endpoint);
         }
 
         try
         {
             _rawEncoding = Ice::stringToEncodingVersion(argument);
         }
-        catch(const Ice::VersionParseException& e)
+        catch(const Ice::VersionParseException& ex)
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid encoding version `" + argument + "' in endpoint " + endpoint + ":\n" + e.str;
-            throw ex;
+            throw Ice::EndpointParseException(__FILE__, __LINE__, "invalid encoding version `" + argument +
+                                              "' in endpoint " + endpoint + ":\n" + ex.str);
         }
         return true;
     }

data/ext/ice/cpp/src/Ice/OpaqueEndpointI.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.
@@ -27,7 +27,7 @@ public:
     OpaqueEndpointI(Ice::Short, Ice::InputStream*);
 
     virtual void streamWrite(Ice::OutputStream*) const;
-    virtual Ice::EndpointInfoPtr getInfo() const;
+    virtual Ice::EndpointInfoPtr getInfo() const ICE_NOEXCEPT;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
 

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

@@ -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/src/Ice/OutputStream.cpp

@@ -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/src/Ice/Plugin.cpp

@@ -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>
 //
@@ -42,7 +42,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
@@ -73,13 +73,17 @@ Ice::Plugin::~Plugin()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Plugin* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(Plugin* p) { return p; }
+/// \endcond
 
 Ice::PluginManager::~PluginManager()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::PluginManager* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(PluginManager* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

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

@@ -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

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

@@ -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.
@@ -73,9 +73,7 @@ Ice::PluginManagerI::initializePlugins()
 {
     if(_initialized)
     {
-        InitializationException ex(__FILE__, __LINE__);
-        ex.reason = "plug-ins already initialized";
-        throw ex;
+        throw InitializationException(__FILE__, __LINE__, "plug-ins already initialized");
     }
 
     //
@@ -133,7 +131,7 @@ Ice::PluginManagerI::initializePlugins()
 }
 
 StringSeq
-Ice::PluginManagerI::getPlugins()
+Ice::PluginManagerI::getPlugins() ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -161,10 +159,7 @@ Ice::PluginManagerI::getPlugin(const string& name)
         return p;
     }
 
-    NotRegisteredException ex(__FILE__, __LINE__);
-    ex.kindOfObject = _kindOfObject;
-    ex.id = name;
-    throw ex;
+    throw NotRegisteredException(__FILE__, __LINE__, _kindOfObject, name);
 }
 
 void
@@ -179,10 +174,7 @@ Ice::PluginManagerI::addPlugin(const string& name, const PluginPtr& plugin)
 
     if(findPlugin(name))
     {
-        AlreadyRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = _kindOfObject;
-        ex.id = name;
-        throw ex;
+        throw AlreadyRegisteredException(__FILE__, __LINE__, _kindOfObject, name);
     }
 
     PluginInfo info;
@@ -192,7 +184,7 @@ Ice::PluginManagerI::addPlugin(const string& name, const PluginPtr& plugin)
 }
 
 void
-Ice::PluginManagerI::destroy()
+Ice::PluginManagerI::destroy() ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -311,9 +303,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, const char* argv[])
 
         if(findPlugin(name))
         {
-            PluginInitializationException ex(__FILE__, __LINE__);
-            ex.reason = "plug-in `" + name + "' already loaded";
-            throw ex;
+            throw PluginInitializationException(__FILE__, __LINE__, "plug-in `" + name + "' already loaded");
         }
 
         string property = prefix + name;
@@ -334,9 +324,7 @@ Ice::PluginManagerI::loadPlugins(int& argc, const char* argv[])
         }
         else
         {
-            PluginInitializationException ex(__FILE__, __LINE__);
-            ex.reason = "plug-in `" + name + "' not defined";
-            throw ex;
+            throw PluginInitializationException(__FILE__, __LINE__, "plug-in `" + name + "' not defined");
         }
     }
 
@@ -417,9 +405,8 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
         }
         catch(const IceUtilInternal::BadOptException& ex)
         {
-            PluginInitializationException e(__FILE__, __LINE__);
-            e.reason = "invalid arguments for plug-in `" + name + "':\n" + ex.reason;
-            throw e;
+            throw PluginInitializationException(__FILE__, __LINE__, "invalid arguments for plug-in `" + name + "':\n" +
+                                                ex.reason);
         }
 
         assert(!args.empty());
@@ -468,16 +455,14 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
         DynamicLibrary::symbol_type sym = library->loadEntryPoint(entryPoint);
         if(sym == 0)
         {
-            ostringstream out;
+            ostringstream os;
             string msg = library->getErrorMessage();
-            out << "unable to load entry point `" << entryPoint << "'";
+            os << "unable to load entry point `" << entryPoint << "'";
             if(!msg.empty())
             {
-                out << ": " + msg;
+                os << ": " + msg;
             }
-            PluginInitializationException ex(__FILE__, __LINE__);
-            ex.reason = out.str();
-            throw ex;
+            throw PluginInitializationException(__FILE__, __LINE__, os.str());
         }
 
 #ifdef __IBMCPP__
@@ -495,11 +480,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
     PluginPtr plugin(factory(_communicator, name, args));
     if(!plugin)
     {
-        PluginInitializationException e(__FILE__, __LINE__);
-        ostringstream out;
-        out << "failure in entry point `" << entryPoint << "'";
-        e.reason = out.str();
-        throw e;
+        throw PluginInitializationException(__FILE__, __LINE__, "failure in entry point `" + entryPoint + "'");
     }
 
     PluginInfo info;