zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/Ice/WSTransceiver.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_WS_TRANSCEIVER_I_H
 #define ICE_WS_TRANSCEIVER_I_H
@@ -140,7 +135,6 @@ private:
 
     std::vector<Ice::Byte> _pingPayload;
 };
-typedef IceUtil::Handle<WSTransceiver> WSTransceiverPtr;
 
 }
 

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.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
@@ -113,6 +108,7 @@ IceDiscovery::LookupReply::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
 IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -126,7 +122,9 @@ IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, c
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
 IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -141,7 +139,9 @@ IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS,
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
 IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
@@ -184,6 +184,7 @@ IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice
         }
     }
 }
+/// \endcond
 
 bool
 IceDiscovery::Lookup::ice_isA(::std::string s, const ::Ice::Current&) const
@@ -210,6 +211,7 @@ IceDiscovery::Lookup::ice_staticId()
     return typeId;
 }
 
+/// \cond INTERNAL
 bool
 IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -217,14 +219,16 @@ IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const :
     auto istr = inS.startReadParams();
     ::std::string iceP_domainId;
     ::Ice::Identity iceP_id;
-    ::std::shared_ptr<::IceDiscovery::LookupReplyPrx> iceP_reply;
+    ::std::shared_ptr<LookupReplyPrx> iceP_reply;
     istr->readAll(iceP_domainId, iceP_id, iceP_reply);
     inS.endReadParams();
     this->findObjectById(::std::move(iceP_domainId), ::std::move(iceP_id), ::std::move(iceP_reply), current);
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
 IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -232,14 +236,16 @@ IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const
     auto istr = inS.startReadParams();
     ::std::string iceP_domainId;
     ::std::string iceP_id;
-    ::std::shared_ptr<::IceDiscovery::LookupReplyPrx> iceP_reply;
+    ::std::shared_ptr<LookupReplyPrx> iceP_reply;
     istr->readAll(iceP_domainId, iceP_id, iceP_reply);
     inS.endReadParams();
     this->findAdapterById(::std::move(iceP_domainId), ::std::move(iceP_id), ::std::move(iceP_reply), current);
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
 IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
@@ -282,7 +288,9 @@ IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Cur
         }
     }
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
 IceDiscovery::LookupReplyPrx::_iceI_foundObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::Identity& iceP_id, const ::std::shared_ptr<::Ice::ObjectPrx>& iceP_prx, const ::Ice::Context& context)
 {
@@ -293,7 +301,9 @@ IceDiscovery::LookupReplyPrx::_iceI_foundObjectById(const ::std::shared_ptr<::Ic
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
 IceDiscovery::LookupReplyPrx::_iceI_foundAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_id, const ::std::shared_ptr<::Ice::ObjectPrx>& iceP_prx, bool iceP_isReplicaGroup, const ::Ice::Context& context)
 {
@@ -304,21 +314,25 @@ IceDiscovery::LookupReplyPrx::_iceI_foundAdapterById(const ::std::shared_ptr<::I
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 IceDiscovery::LookupReplyPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<LookupReplyPrx>();
 }
+/// \endcond
 
 const ::std::string&
 IceDiscovery::LookupReplyPrx::ice_staticId()
 {
-    return IceDiscovery::LookupReply::ice_staticId();
+    return LookupReply::ice_staticId();
 }
 
+/// \cond INTERNAL
 void
-IceDiscovery::LookupPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::Ice::Identity& iceP_id, const ::std::shared_ptr<::IceDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
+IceDiscovery::LookupPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::Ice::Identity& iceP_id, const ::std::shared_ptr<LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
 {
     outAsync->invoke(iceC_IceDiscovery_Lookup_findObjectById_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
         [&](::Ice::OutputStream* ostr)
@@ -327,9 +341,11 @@ IceDiscovery::LookupPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInter
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
-IceDiscovery::LookupPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::std::string& iceP_id, const ::std::shared_ptr<::IceDiscovery::LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
+IceDiscovery::LookupPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_domainId, const ::std::string& iceP_id, const ::std::shared_ptr<LookupReplyPrx>& iceP_reply, const ::Ice::Context& context)
 {
     outAsync->invoke(iceC_IceDiscovery_Lookup_findAdapterById_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
         [&](::Ice::OutputStream* ostr)
@@ -338,17 +354,20 @@ IceDiscovery::LookupPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInte
         },
         nullptr);
 }
+/// \endcond
 
+/// \cond INTERNAL
 ::std::shared_ptr<::Ice::ObjectPrx>
 IceDiscovery::LookupPrx::_newInstance() const
 {
     return ::IceInternal::createProxy<LookupPrx>();
 }
+/// \endcond
 
 const ::std::string&
 IceDiscovery::LookupPrx::ice_staticId()
 {
-    return IceDiscovery::Lookup::ice_staticId();
+    return Lookup::ice_staticId();
 }
 
 #else // C++98 mapping
@@ -365,10 +384,12 @@ const ::std::string iceC_IceDiscovery_Lookup_findObjectById_name = "findObjectBy
 const ::std::string iceC_IceDiscovery_Lookup_findAdapterById_name = "findAdapterById";
 
 }
-::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(::IceProxy::IceDiscovery::LookupReply* p) { return p; }
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(LookupReply* p) { return p; }
 
 void
-::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceDiscovery::LookupReply>& v)
+::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< LookupReply>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -378,10 +399,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::IceDiscovery::LookupReply;
+        v = new LookupReply;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::IceDiscovery::LookupReply::_iceI_begin_foundObjectById(const ::Ice::Identity& iceP_id, const ::Ice::ObjectPrx& iceP_prx, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -436,21 +458,25 @@ IceProxy::IceDiscovery::LookupReply::end_foundAdapterById(const ::Ice::AsyncResu
     _end(result, iceC_IceDiscovery_LookupReply_foundAdapterById_name);
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::IceDiscovery::LookupReply::_newInstance() const
 {
     return new LookupReply;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::IceDiscovery::LookupReply::ice_staticId()
 {
     return ::IceDiscovery::LookupReply::ice_staticId();
 }
-::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(::IceProxy::IceDiscovery::Lookup* p) { return p; }
+
+/// \cond INTERNAL
+::IceProxy::Ice::Object* ::IceProxy::IceDiscovery::upCast(Lookup* p) { return p; }
 
 void
-::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::IceDiscovery::Lookup>& v)
+::IceProxy::IceDiscovery::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Lookup>& v)
 {
     ::Ice::ObjectPrx proxy;
     istr->read(proxy);
@@ -460,10 +486,11 @@ void
     }
     else
     {
-        v = new ::IceProxy::IceDiscovery::Lookup;
+        v = new Lookup;
         v->_copyFrom(proxy);
     }
 }
+/// \endcond
 
 ::Ice::AsyncResultPtr
 IceProxy::IceDiscovery::Lookup::_iceI_begin_findObjectById(const ::std::string& iceP_domainId, const ::Ice::Identity& iceP_id, const ::IceDiscovery::LookupReplyPrx& iceP_reply, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
@@ -519,11 +546,13 @@ IceProxy::IceDiscovery::Lookup::end_findAdapterById(const ::Ice::AsyncResultPtr&
     _end(result, iceC_IceDiscovery_Lookup_findAdapterById_name);
 }
 
+/// \cond INTERNAL
 ::IceProxy::Ice::Object*
 IceProxy::IceDiscovery::Lookup::_newInstance() const
 {
     return new Lookup;
 }
+/// \endcond
 
 const ::std::string&
 IceProxy::IceDiscovery::Lookup::ice_staticId()
@@ -535,8 +564,10 @@ IceDiscovery::LookupReply::~LookupReply()
 {
 }
 
-::Ice::Object* IceDiscovery::upCast(::IceDiscovery::LookupReply* p) { return p; }
+/// \cond INTERNAL
+::Ice::Object* IceDiscovery::upCast(LookupReply* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -577,6 +608,7 @@ IceDiscovery::LookupReply::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
 IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -591,7 +623,9 @@ IceDiscovery::LookupReply::_iceD_foundObjectById(::IceInternal::Incoming& inS, c
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
 IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -608,6 +642,7 @@ IceDiscovery::LookupReply::_iceD_foundAdapterById(::IceInternal::Incoming& inS,
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -623,6 +658,7 @@ const ::std::string iceC_IceDiscovery_LookupReply_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
 IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
@@ -665,12 +701,14 @@ IceDiscovery::LookupReply::_iceDispatch(::IceInternal::Incoming& in, const ::Ice
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
 IceDiscovery::LookupReply::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::IceDiscovery::LookupReply, ::Ice::OutputStream>::write(ostr, *this);
+    ::Ice::StreamWriter< LookupReply, ::Ice::OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
@@ -678,26 +716,31 @@ void
 IceDiscovery::LookupReply::_iceReadImpl(::Ice::InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::IceDiscovery::LookupReply, ::Ice::InputStream>::read(istr, *this);
+    ::Ice::StreamReader< LookupReply, ::Ice::InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
 IceDiscovery::_icePatchObjectPtr(LookupReplyPtr& handle, const ::Ice::ObjectPtr& v)
 {
-    handle = ::IceDiscovery::LookupReplyPtr::dynamicCast(v);
+    handle = LookupReplyPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::IceDiscovery::LookupReply::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(LookupReply::ice_staticId(), v);
     }
 }
+/// \endcond
 
 IceDiscovery::Lookup::~Lookup()
 {
 }
 
-::Ice::Object* IceDiscovery::upCast(::IceDiscovery::Lookup* p) { return p; }
+/// \cond INTERNAL
+::Ice::Object* IceDiscovery::upCast(Lookup* p) { return p; }
 
+/// \endcond
 
 namespace
 {
@@ -738,6 +781,7 @@ IceDiscovery::Lookup::ice_staticId()
 #endif
 }
 
+/// \cond INTERNAL
 bool
 IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -745,7 +789,7 @@ IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const :
     ::Ice::InputStream* istr = inS.startReadParams();
     ::std::string iceP_domainId;
     ::Ice::Identity iceP_id;
-    ::IceDiscovery::LookupReplyPrx iceP_reply;
+    LookupReplyPrx iceP_reply;
     istr->read(iceP_domainId);
     istr->read(iceP_id);
     istr->read(iceP_reply);
@@ -754,7 +798,9 @@ IceDiscovery::Lookup::_iceD_findObjectById(::IceInternal::Incoming& inS, const :
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
+/// \cond INTERNAL
 bool
 IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const ::Ice::Current& current)
 {
@@ -762,7 +808,7 @@ IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const
     ::Ice::InputStream* istr = inS.startReadParams();
     ::std::string iceP_domainId;
     ::std::string iceP_id;
-    ::IceDiscovery::LookupReplyPrx iceP_reply;
+    LookupReplyPrx iceP_reply;
     istr->read(iceP_domainId);
     istr->read(iceP_id);
     istr->read(iceP_reply);
@@ -771,6 +817,7 @@ IceDiscovery::Lookup::_iceD_findAdapterById(::IceInternal::Incoming& inS, const
     inS.writeEmptyParams();
     return true;
 }
+/// \endcond
 
 namespace
 {
@@ -786,6 +833,7 @@ const ::std::string iceC_IceDiscovery_Lookup_all[] =
 
 }
 
+/// \cond INTERNAL
 bool
 IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
 {
@@ -828,12 +876,14 @@ IceDiscovery::Lookup::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Cur
         }
     }
 }
+/// \endcond
 
+/// \cond STREAM
 void
 IceDiscovery::Lookup::_iceWriteImpl(::Ice::OutputStream* ostr) const
 {
     ostr->startSlice(ice_staticId(), -1, true);
-    Ice::StreamWriter< ::IceDiscovery::Lookup, ::Ice::OutputStream>::write(ostr, *this);
+    ::Ice::StreamWriter< Lookup, ::Ice::OutputStream>::write(ostr, *this);
     ostr->endSlice();
 }
 
@@ -841,19 +891,22 @@ void
 IceDiscovery::Lookup::_iceReadImpl(::Ice::InputStream* istr)
 {
     istr->startSlice();
-    Ice::StreamReader< ::IceDiscovery::Lookup, ::Ice::InputStream>::read(istr, *this);
+    ::Ice::StreamReader< Lookup, ::Ice::InputStream>::read(istr, *this);
     istr->endSlice();
 }
+/// \endcond
 
+/// \cond INTERNAL
 void
 IceDiscovery::_icePatchObjectPtr(LookupPtr& handle, const ::Ice::ObjectPtr& v)
 {
-    handle = ::IceDiscovery::LookupPtr::dynamicCast(v);
+    handle = LookupPtr::dynamicCast(v);
     if(v && !handle)
     {
-        IceInternal::Ex::throwUOE(::IceDiscovery::Lookup::ice_staticId(), v);
+        IceInternal::Ex::throwUOE(Lookup::ice_staticId(), v);
     }
 }
+/// \endcond
 
 namespace Ice
 {