zeroc-ice 3.7.0 → 3.7.5

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -73,13 +68,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,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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 <IceUtil/Options.h>
 #include <Ice/PluginManagerI.h>
@@ -73,9 +68,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 +126,7 @@ Ice::PluginManagerI::initializePlugins()
 }
 
 StringSeq
-Ice::PluginManagerI::getPlugins()
+Ice::PluginManagerI::getPlugins() ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -161,10 +154,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 +169,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 +179,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 +298,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 +319,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 +400,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 +450,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 +475,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;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_PLUGIN_MANAGER_I_H
 #define ICE_PLUGIN_MANAGER_I_H
@@ -30,10 +25,10 @@ public:
     static void registerPluginFactory(const std::string&, PluginFactory, bool);
 
     virtual void initializePlugins();
-    virtual StringSeq getPlugins();
+    virtual StringSeq getPlugins() ICE_NOEXCEPT;
     virtual PluginPtr getPlugin(const std::string&);
     virtual void addPlugin(const std::string&, const PluginPtr&);
-    virtual void destroy();
+    virtual void destroy() ICE_NOEXCEPT;
     PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
 
 private:

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <auto-generated>
 //
@@ -42,10 +37,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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -75,19 +70,19 @@ const ::std::string iceC_Ice_Process_writeMessage_name = "writeMessage";
 }
 
 bool
-Ice::Process::ice_isA(::std::string s, const ::Ice::Current&) const
+Ice::Process::ice_isA(::std::string s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_Process_ids, iceC_Ice_Process_ids + 2, s);
 }
 
 ::std::vector<::std::string>
-Ice::Process::ice_ids(const ::Ice::Current&) const
+Ice::Process::ice_ids(const Current&) const
 {
     return ::std::vector<::std::string>(&iceC_Ice_Process_ids[0], &iceC_Ice_Process_ids[2]);
 }
 
 ::std::string
-Ice::Process::ice_id(const ::Ice::Current&) const
+Ice::Process::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -99,8 +94,9 @@ Ice::Process::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     inS.readEmptyParams();
@@ -108,9 +104,11 @@ Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current&
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     auto istr = inS.startReadParams();
@@ -122,14 +120,16 @@ Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Curr
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Process_ops, iceC_Ice_Process_ops + 6, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
     switch(r.first - iceC_Ice_Process_ops)
@@ -161,40 +161,47 @@ Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& cu
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::ProcessPrx::_iceI_shutdown(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::Context& context)
+Ice::ProcessPrx::_iceI_shutdown(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const Context& context)
 {
     outAsync->invoke(iceC_Ice_Process_shutdown_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::ProcessPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_message, int iceP_fd, const ::Ice::Context& context)
+Ice::ProcessPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_message, int iceP_fd, const Context& context)
 {
     outAsync->invoke(iceC_Ice_Process_writeMessage_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
-        [&](::Ice::OutputStream* ostr)
+        [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_message, iceP_fd);
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 Ice::ProcessPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<ProcessPrx>();
 }
+/// \endcond
 
 const ::std::string&
 Ice::ProcessPrx::ice_staticId()
 {
-    return Ice::Process::ice_staticId();
+    return Process::ice_staticId();
 }
 
 #else // C++98 mapping
@@ -207,10 +214,12 @@ const ::std::string iceC_Ice_Process_shutdown_name = "shutdown";
 const ::std::string iceC_Ice_Process_writeMessage_name = "writeMessage";
 
 }
-ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Process* p) { return p; }
+
+/// \cond INTERNAL
+ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(Process* p) { return p; }
 
 void
-::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>& v)
+::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Process>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -220,10 +229,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::Ice::Process;
+        v = new Process;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::Ice::Process::_iceI_begin_shutdown(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -274,11 +284,13 @@ IceProxy::Ice::Process::end_writeMessage(const ::Ice::AsyncResultPtr& result)
     _end(result, iceC_Ice_Process_writeMessage_name);
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::Ice::Process::_newInstance() const
 {
     return new Process;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::Ice::Process::ice_staticId()
@@ -290,8 +302,10 @@ Ice::Process::~Process()
 {
 }
 
-ICE_API ::Ice::Object* Ice::upCast(::Ice::Process* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::Object* Ice::upCast(Process* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -304,19 +318,19 @@ const ::std::string iceC_Ice_Process_ids[2] =
 }
 
 bool
-Ice::Process::ice_isA(const ::std::string& s, const ::Ice::Current&) const
+Ice::Process::ice_isA(const ::std::string& s, const Current&) const
 {
     return ::std::binary_search(iceC_Ice_Process_ids, iceC_Ice_Process_ids + 2, s);
 }
 
 ::std::vector< ::std::string>
-Ice::Process::ice_ids(const ::Ice::Current&) const
+Ice::Process::ice_ids(const Current&) const
 {
     return ::std::vector< ::std::string>(&iceC_Ice_Process_ids[0], &iceC_Ice_Process_ids[2]);
 }
 
 const ::std::string&
-Ice::Process::ice_id(const ::Ice::Current&) const
+Ice::Process::ice_id(const Current&) const
 {
     return ice_staticId();
 }
@@ -332,8 +346,9 @@ Ice::Process::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
     inS.readEmptyParams();
@@ -341,14 +356,16 @@ Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current&
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Current& current)
+Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const Current& current)
 {
     _iceCheckMode(::Ice::Normal, current.mode);
-    ::Ice::InputStream* istr = inS.startReadParams();
+    InputStream* istr = inS.startReadParams();
     ::std::string iceP_message;
-    ::Ice::Int iceP_fd;
+    Int iceP_fd;
     istr->read(iceP_message);
     istr->read(iceP_fd);
     inS.endReadParams();
@@ -356,6 +373,7 @@ Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Curr
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -371,13 +389,14 @@ const ::std::string iceC_Ice_Process_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
-Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
+Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
 {
     ::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Process_all, iceC_Ice_Process_all + 6, current.operation);
     if(r.first == r.second)
     {
-        throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
     }
 
     switch(r.first - iceC_Ice_Process_all)
@@ -409,36 +428,41 @@ Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& cu
         default:
         {
             assert(false);
-            throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
+            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
-Ice::Process::_iceWriteImpl(::Ice::OutputStream* ostr) const
+Ice::Process::_iceWriteImpl(OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::Ice::Process, ::Ice::OutputStream>::write(ostr, *this);
+    StreamWriter< Process, OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
 void
-Ice::Process::_iceReadImpl(::Ice::InputStream* istr)
+Ice::Process::_iceReadImpl(InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::Ice::Process, ::Ice::InputStream>::read(istr, *this);
+    StreamReader< Process, InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-Ice::_icePatchObjectPtr(ProcessPtr& handle, const ::Ice::ObjectPtr& v)
+Ice::_icePatchObjectPtr(ProcessPtr& handle, const ObjectPtr& v)
 {
-    handle = ::Ice::ProcessPtr::dynamicCast(v);
+    handle = ProcessPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::Ice::Process::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(Process::ice_staticId(), v);
     }
 }
+/// \endcond
 
 namespace Ice
 {