zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/IceDiscovery/LocatorI.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 <IceDiscovery/LocatorI.h>
 #include <IceDiscovery/LookupI.h>
@@ -14,6 +9,8 @@
 #include <Ice/Communicator.h>
 #include <Ice/ObjectAdapter.h>
 
+#include <IceUtil/Random.h>
+
 #include <iterator>
 
 using namespace std;
@@ -172,7 +169,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
         return 0;
     }
 
-    random_shuffle(adapterIds.begin(), adapterIds.end());
+    IceUtilInternal::shuffle(adapterIds.begin(), adapterIds.end());
     return prx->ice_adapterId(adapterIds[0]);
 }
 

data/ext/ice/cpp/src/IceDiscovery/LocatorI.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 LOCATORI_H
 #define LOCATORI_H

data/ext/ice/cpp/src/IceDiscovery/LookupI.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 <Ice/Connection.h>
 #include <Ice/ObjectAdapter.h>
@@ -196,9 +191,9 @@ AdapterRequest::invokeWithLookup(const string& domainId, const LookupPrxPtr& loo
         {
             rethrow_exception(ex);
         }
-        catch(const Ice::LocalException& ex)
+        catch(const Ice::LocalException& e)
         {
-            self->_lookup->adapterRequestException(self, ex);
+            self->_lookup->adapterRequestException(self, e);
         }
     });
 #else
@@ -235,9 +230,9 @@ ObjectRequest::invokeWithLookup(const string& domainId, const LookupPrxPtr& look
         {
             rethrow_exception(ex);
         }
-        catch(const Ice::LocalException& ex)
+        catch(const Ice::LocalException& e)
         {
-            self->_lookup->objectRequestException(self, ex);
+            self->_lookup->objectRequestException(self, e);
         }
     });
 #else

data/ext/ice/cpp/src/IceDiscovery/LookupI.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 LOOKUPI_H
 #define LOOKUPI_H

data/ext/ice/cpp/src/IceDiscovery/PluginI.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/IceUtil.h>
 #include <Ice/Ice.h>

data/ext/ice/cpp/src/IceDiscovery/PluginI.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 PLUGIN_I_H
 #define PLUGIN_I_H

data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.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>
 //
@@ -40,10 +35,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
@@ -110,6 +105,7 @@ IceLocatorDiscovery::LookupReply::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
 IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -122,7 +118,9 @@ IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& in
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
 IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
@@ -161,6 +159,7 @@ IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, cons
         }
     }
 }
+/// \endcond
 
 bool
 IceLocatorDiscovery::Lookup::ice_isA(::std::string s, const ::Ice::Current&) const
@@ -187,20 +186,23 @@ IceLocatorDiscovery::Lookup::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
 IceLocatorDiscovery::Lookup::_iceD_findLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
     _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_instanceName;
-    ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx> iceP_reply;
+    ::std::shared_ptr<LookupReplyPrx> iceP_reply;
     istr->readAll(iceP_instanceName, iceP_reply);
     inS.endReadParams();
     this->findLocator(::std::move(iceP_instanceName), ::std::move(iceP_reply), current);
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
 IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
@@ -239,7 +241,9 @@ IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::I
         }
     }
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
 IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::shared_ptr<::Ice::LocatorPrx>& iceP_prx, const ::Ice::Context& context)
 {
@@ -250,21 +254,25 @@ IceLocatorDiscovery::LookupReplyPrx::_iceI_foundLocator(const ::std::shared_ptr<
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 IceLocatorDiscovery::LookupReplyPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<LookupReplyPrx>();
 }
+/// \endcond
 
 const ::std::string&
 IceLocatorDiscovery::LookupReplyPrx::ice_staticId()
 {
-    return IceLocatorDiscovery::LookupReply::ice_staticId();
+    return LookupReply::ice_staticId();
 }
 
+/// \cond INTERNAL
 void
-IceLocatorDiscovery::LookupPrx::_iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_instanceName, const ::std::shared_ptr<::IceLocatorDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
+IceLocatorDiscovery::LookupPrx::_iceI_findLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_instanceName, const ::std::shared_ptr<LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
 {
     outAsync->invoke(iceC_IceLocatorDiscovery_Lookup_findLocator_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
         [&](::Ice::OutputStream* ostr)
@@ -273,17 +281,20 @@ IceLocatorDiscovery::LookupPrx::_iceI_findLocator(const ::std::shared_ptr<::IceI
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 IceLocatorDiscovery::LookupPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<LookupPrx>();
 }
+/// \endcond
 
 const ::std::string&
 IceLocatorDiscovery::LookupPrx::ice_staticId()
 {
-    return IceLocatorDiscovery::Lookup::ice_staticId();
+    return Lookup::ice_staticId();
 }
 
 #else // C++98 mapping
@@ -296,10 +307,12 @@ const ::std::string iceC_IceLocatorDiscovery_LookupReply_foundLocator_name = "fo
 const ::std::string iceC_IceLocatorDiscovery_Lookup_findLocator_name = "findLocator";
 
 }
-::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(::IceProxy::IceLocatorDiscovery::LookupReply* p) { return p; }
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(LookupReply* p) { return p; }
 
 void
-::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::LookupReply>& v)
+::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LookupReply>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -309,10 +322,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::IceLocatorDiscovery::LookupReply;
+        v = new LookupReply;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::IceLocatorDiscovery::LookupReply::_iceI_begin_foundLocator(const ::Ice::LocatorPrx& iceP_prx, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -339,21 +353,25 @@ IceProxy::IceLocatorDiscovery::LookupReply::end_foundLocator(const ::Ice::AsyncR
     _end(result, iceC_IceLocatorDiscovery_LookupReply_foundLocator_name);
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::IceLocatorDiscovery::LookupReply::_newInstance() const
 {
     return new LookupReply;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::IceLocatorDiscovery::LookupReply::ice_staticId()
 {
     return ::IceLocatorDiscovery::LookupReply::ice_staticId();
 }
-::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(::IceProxy::IceLocatorDiscovery::Lookup* p) { return p; }
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object* ::IceProxy::IceLocatorDiscovery::upCast(Lookup* p) { return p; }
 
 void
-::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceLocatorDiscovery::Lookup>& v)
+::IceProxy::IceLocatorDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Lookup>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -363,10 +381,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::IceLocatorDiscovery::Lookup;
+        v = new Lookup;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::IceLocatorDiscovery::Lookup::_iceI_begin_findLocator(const ::std::string& iceP_instanceName, const ::IceLocatorDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -394,11 +413,13 @@ IceProxy::IceLocatorDiscovery::Lookup::end_findLocator(const ::Ice::AsyncResultP
     _end(result, iceC_IceLocatorDiscovery_Lookup_findLocator_name);
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::IceLocatorDiscovery::Lookup::_newInstance() const
 {
     return new Lookup;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::IceLocatorDiscovery::Lookup::ice_staticId()
@@ -410,8 +431,10 @@ IceLocatorDiscovery::LookupReply::~LookupReply()
 {
 }
 
-::Ice::Object* IceLocatorDiscovery::upCast(::IceLocatorDiscovery::LookupReply* p) { return p; }
+/// \cond INTERNAL
+::Ice::Object* IceLocatorDiscovery::upCast(LookupReply* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -452,6 +475,7 @@ IceLocatorDiscovery::LookupReply::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
 IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -464,6 +488,7 @@ IceLocatorDiscovery::LookupReply::_iceD_foundLocator(::IceInternal::Incoming& in
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -478,6 +503,7 @@ const ::std::string iceC_IceLocatorDiscovery_LookupReply_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
 IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
@@ -516,12 +542,14 @@ IceLocatorDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, cons
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
 IceLocatorDiscovery::LookupReply::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::IceLocatorDiscovery::LookupReply, ::Ice::OutputStream>::write(ostr, *this);
+    ::Ice::StreamWriter< LookupReply, ::Ice::OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
@@ -529,26 +557,31 @@ void
 IceLocatorDiscovery::LookupReply::_iceReadImpl(::Ice::InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::IceLocatorDiscovery::LookupReply, ::Ice::InputStream>::read(istr, *this);
+    ::Ice::StreamReader< LookupReply, ::Ice::InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
 IceLocatorDiscovery::_icePatchObjectPtr(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
 {
-    handle = ::IceLocatorDiscovery::LookupReplyPtr::dynamicCast(v);
+    handle = LookupReplyPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::IceLocatorDiscovery::LookupReply::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(LookupReply::ice_staticId(), v);
     }
 }
+/// \endcond
 
 IceLocatorDiscovery::Lookup::~Lookup()
 {
 }
 
-::Ice::Object* IceLocatorDiscovery::upCast(::IceLocatorDiscovery::Lookup* p) { return p; }
+/// \cond INTERNAL
+::Ice::Object* IceLocatorDiscovery::upCast(Lookup* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -589,13 +622,14 @@ IceLocatorDiscovery::Lookup::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
 IceLocatorDiscovery::Lookup::_iceD_findLocator(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
     _iceCheckMode(::Ice::Idempotent, current.mode);
     ::Ice::InputStream* istr = inS.startReadParams();
     ::std::string iceP_instanceName;
-    ::IceLocatorDiscovery::LookupReplyPrx iceP_reply;
+    LookupReplyPrx iceP_reply;
     istr->read(iceP_instanceName);
     istr->read(iceP_reply);
     inS.endReadParams();
@@ -603,6 +637,7 @@ IceLocatorDiscovery::Lookup::_iceD_findLocator(::IceInternal::Incoming& inS, con
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -617,6 +652,7 @@ const ::std::string iceC_IceLocatorDiscovery_Lookup_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
 IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
@@ -655,12 +691,14 @@ IceLocatorDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::I
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
 IceLocatorDiscovery::Lookup::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::IceLocatorDiscovery::Lookup, ::Ice::OutputStream>::write(ostr, *this);
+    ::Ice::StreamWriter< Lookup, ::Ice::OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
@@ -668,19 +706,22 @@ void
 IceLocatorDiscovery::Lookup::_iceReadImpl(::Ice::InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::IceLocatorDiscovery::Lookup, ::Ice::InputStream>::read(istr, *this);
+    ::Ice::StreamReader< Lookup, ::Ice::InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
 IceLocatorDiscovery::_icePatchObjectPtr(LookupPtr& handle, const ::Ice::ObjectPtr& v)
 {
-    handle = ::IceLocatorDiscovery::LookupPtr::dynamicCast(v);
+    handle = LookupPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::IceLocatorDiscovery::Lookup::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(Lookup::ice_staticId(), v);
     }
 }
+/// \endcond
 
 namespace Ice
 {