zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/include/Ice/ProxyF.h

@@ -1,60 +1,34 @@
-// **********************************************************************
 //
-// 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_PROXY_F_H
 #define ICE_PROXY_F_H
 
-#include <IceUtil/Shared.h>
-
 #include <Ice/Config.h>
 #include <Ice/ProxyHandle.h>
 
-namespace IceProxy
-{
-
+#ifdef ICE_CPP11_MAPPING
 namespace Ice
 {
 
-class Object;
-inline Object* upCast(Object* o) { return o; }
-
-}
+class ObjectPrx;
+/// \cond INTERNAL
+using ObjectPrxPtr = ::std::shared_ptr<ObjectPrx>;
+/// \endcond
 
 }
 
-namespace IceDelegate
-{
-
-namespace Ice
+namespace IceInternal
 {
 
-class Object;
-inline Object* upCast(Object* o) { return o; }
-
-}
+template<typename P>
+::std::shared_ptr<P> createProxy();
 
 }
 
-namespace IceDelegateM
-{
-
-namespace Ice
-{
-
-class Object;
-inline Object* upCast(Object* o) { return o; }
-
-}
-
-}
-
-namespace IceDelegateD
+#else // C++98 mapping
+namespace IceProxy
 {
 
 namespace Ice
@@ -71,8 +45,9 @@ namespace Ice
 {
 
 typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx;
+typedef ObjectPrx ObjectPrxPtr;
 
 }
 
-
+#endif
 #endif

data/ext/ice/cpp/include/Ice/ProxyFactoryF.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_PROXY_FACTORY_F_H
 #define ICE_PROXY_FACTORY_F_H

data/ext/ice/cpp/include/Ice/ProxyHandle.h

@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// 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_PROXY_HANDLE_H
 #define ICE_PROXY_HANDLE_H
 
+#ifndef ICE_CPP11_MAPPING // C++98 mapping
+
 #include <IceUtil/Handle.h>
 #include <Ice/Config.h>
 
@@ -23,8 +20,8 @@ template class Handle;
 
 }
 
-namespace IceProxy 
-{ 
+namespace IceProxy
+{
 namespace Ice
 {
 
@@ -36,24 +33,35 @@ class Object;
 namespace Ice
 {
 
+/** Smart pointer for an object proxy. */
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx;
 
 class ObjectAdapter;
 typedef ::IceInternal::Handle< ::Ice::ObjectAdapter> ObjectAdapterPtr;
 
+/**
+ * A request context. Context is used to transmit metadata about a
+ * request from the server to the client, such as Quality-of-Service
+ * (QoS) parameters. Each remote operation on a proxy optionally
+ * accepts a Context parameter.
+ **/
 typedef ::std::map< ::std::string, ::std::string> Context;
+
+/** Sentinel value indicating that no explicit context argument was passed to a remote invocation. */
+ICE_API extern const Context noExplicitContext;
+
 }
 
 namespace IceInternal
 {
 
-template<typename P> P 
-checkedCastImpl(const ::Ice::ObjectPrx&, const ::Ice::Context*);
+template<typename P> P
+checkedCastImpl(const ::Ice::ObjectPrx&, const ::Ice::Context&);
 
-template<typename P> P 
-checkedCastImpl(const ::Ice::ObjectPrx&, const std::string&, const ::Ice::Context*);
+template<typename P> P
+checkedCastImpl(const ::Ice::ObjectPrx&, const std::string&, const ::Ice::Context&);
 
-template<typename P> P 
+template<typename P> P
 uncheckedCastImpl(const ::Ice::ObjectPrx&);
 
 template<typename P> P
@@ -62,13 +70,13 @@ uncheckedCastImpl(const ::Ice::ObjectPrx&, const std::string&);
 //
 // Upcast
 //
-template<typename T, typename Y> inline ProxyHandle<T> 
-checkedCastHelper(const ::IceInternal::ProxyHandle<Y>& b, T*, const ::Ice::Context*)
+template<typename T, typename Y> inline ProxyHandle<T>
+checkedCastHelper(const ::IceInternal::ProxyHandle<Y>& b, T*, const ::Ice::Context&)
 {
     return b;
 }
 
-template<typename T, typename Y> inline ProxyHandle<T> 
+template<typename T, typename Y> inline ProxyHandle<T>
 uncheckedCastHelper(const ::IceInternal::ProxyHandle<Y>& b, T*)
 {
     return b;
@@ -77,8 +85,8 @@ uncheckedCastHelper(const ::IceInternal::ProxyHandle& b, T*)
 //
 // Downcast
 //
-template<typename T, typename Y> inline ProxyHandle<T> 
-checkedCastHelper(const ::IceInternal::ProxyHandle<Y>& b, void*, const ::Ice::Context* ctx)
+template<typename T, typename Y> inline ProxyHandle<T>
+checkedCastHelper(const ::IceInternal::ProxyHandle<Y>& b, void*, const ::Ice::Context& ctx)
 {
 #ifdef __SUNPRO_CC
     //
@@ -91,7 +99,7 @@ checkedCastHelper(const ::IceInternal::ProxyHandle& b, void*, const ::Ice::Co
 #endif
 }
 
-template<typename T, typename Y> inline ProxyHandle<T> 
+template<typename T, typename Y> inline ProxyHandle<T>
 uncheckedCastHelper(const ::IceInternal::ProxyHandle<Y>& b, void*)
 {
 #ifdef __SUNPRO_CC
@@ -114,7 +122,7 @@ template
 class ProxyHandle : public ::IceUtil::HandleBase<T>
 {
 public:
-    
+
     ProxyHandle(T* p = 0)
     {
         this->_ptr = p;
@@ -124,7 +132,7 @@ public:
             upCast(this->_ptr)->__incRef();
         }
     }
-    
+
     template<typename Y>
     ProxyHandle(const ProxyHandle<Y>& r)
     {
@@ -156,7 +164,7 @@ public:
             upCast(this->_ptr)->__incRef();
         }
     }
-    
+
     ~ProxyHandle()
     {
         if(this->_ptr)
@@ -164,7 +172,7 @@ public:
             upCast(this->_ptr)->__decRef();
         }
     }
-    
+
     ProxyHandle& operator=(T* p)
     {
         if(this->_ptr != p)
@@ -178,12 +186,12 @@ public:
             {
                 upCast(this->_ptr)->__decRef();
             }
-            
+
             this->_ptr = p;
         }
         return *this;
     }
-        
+
     template<typename Y>
     ProxyHandle& operator=(const ProxyHandle<Y>& r)
     {
@@ -198,7 +206,7 @@ public:
             {
                 upCast(this->_ptr)->__decRef();
             }
-            
+
             this->_ptr = r._ptr;
         }
         return *this;
@@ -218,7 +226,7 @@ public:
             {
                 upCast(this->_ptr)->__decRef();
             }
-            
+
             this->_ptr = r._ptr;
         }
         return *this;
@@ -237,29 +245,28 @@ public:
             {
                 upCast(this->_ptr)->__decRef();
             }
-            
+
             this->_ptr = r._ptr;
         }
         return *this;
     }
 
-    ::IceProxy::Ice::Object* __upCast() const
+    ::IceProxy::Ice::Object* _upCast() const
     {
         return upCast(this->_ptr);
     }
-        
+
     template<class Y>
-    static ProxyHandle checkedCast(const ProxyHandle<Y>& r)
+    static ProxyHandle checkedCast(const ProxyHandle<Y>& r, const ::Ice::Context& ctx = ::Ice::noExplicitContext)
     {
         Y* tag = 0;
-        Ice::Context* ctx = 0;
         return ::IceInternal::checkedCastHelper<T>(r, tag, ctx);
     }
 
     template<class Y>
-    static ProxyHandle checkedCast(const ProxyHandle<Y>& r, const std::string& f)
+    static ProxyHandle checkedCast(const ProxyHandle<Y>& r, const std::string& f,
+                                   const ::Ice::Context& ctx = ::Ice::noExplicitContext)
     {
-        Ice::Context* ctx = 0;
 #ifdef __SUNPRO_CC
         //
         // Sun CC bug introduced in version 5.10
@@ -271,27 +278,6 @@ public:
 #endif
     }
 
-    template<class Y>
-    static ProxyHandle checkedCast(const ProxyHandle<Y>& r, const ::Ice::Context& ctx)
-    {
-        Y* tag = 0;
-        return ::IceInternal::checkedCastHelper<T>(r, tag, &ctx);
-    }
-
-    template<class Y>
-    static ProxyHandle checkedCast(const ProxyHandle<Y>& r, const std::string& f, const ::Ice::Context& ctx)
-    {
-#ifdef __SUNPRO_CC
-        //
-        // Sun CC bug introduced in version 5.10
-        //
-        const ::Ice::ObjectPrx& o = r;
-        return ::IceInternal::checkedCastImpl<ProxyHandle>(o, f, &ctx);
-#else
-        return ::IceInternal::checkedCastImpl<ProxyHandle>(r, f, &ctx);
-#endif
-    }
-
     template<class Y>
     static ProxyHandle uncheckedCast(const ProxyHandle<Y>& r)
     {
@@ -328,3 +314,5 @@ std::ostream& operator<<(std::ostream& os, ::IceInternal::ProxyHandle p)
 }
 
 #endif
+
+#endif

data/ext/ice/cpp/include/Ice/ReferenceF.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_REFERENCE_F_H
 #define ICE_REFERENCE_F_H

data/ext/ice/cpp/include/Ice/RegisterPlugins.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_REGISTER_PLUGINS_H
 #define ICE_REGISTER_PLUGINS_H
@@ -16,7 +11,7 @@
 // Register functions for Ice plugins are declared here.
 //
 // These functions can be used to explicitly link with a plugin rather
-// thanrelying on the loading of the plugin at runtime. The application
+// than relying on the loading of the plugin at runtime. The application
 // must call the register function before initializing the communicator.
 //
 
@@ -35,21 +30,98 @@ namespace Ice
 //
 
 #ifndef ICE_API_EXPORTS
-ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceStringConverter(bool = true);
+/**
+ * When using static libraries, calling this function ensures the string converter plug-in is
+ * linked with the application.
+ * @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
+ * If false, the plug-in is only loaded during communicator initialization if its corresponding
+ * plug-in property is set to 1.
+ */
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceStringConverter(bool loadOnInitialize = true);
+
+/**
+ * When using static libraries, calling this function ensures the UDP transport is
+ * linked with the application.
+ * @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
+ * If false, the plug-in is only loaded during communicator initialization if its corresponding
+ * plug-in property is set to 1.
+ */
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceUDP(bool loadOnInitialize = true);
+
+/**
+ * When using static libraries, calling this function ensures the WebSocket transport is
+ * linked with the application.
+ * @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
+ * If false, the plug-in is only loaded during communicator initialization if its corresponding
+ * plug-in property is set to 1.
+ */
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceWS(bool loadOnInitialize = true);
 #endif
 
-#ifndef ICE_SSL_API_EXPORTS
-ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceSSL(bool = true);
+#ifndef ICESSL_API_EXPORTS
+/**
+ * When using static libraries, calling this function ensures the SSL transport is
+ * linked with the application.
+ * @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
+ * If false, the plug-in is only loaded during communicator initialization if its corresponding
+ * plug-in property is set to 1.
+ */
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceSSL(bool loadOnInitialize = true);
 #endif
 
 #ifndef ICE_DISCOVERY_API_EXPORTS
-ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceDiscovery(bool = true);
+/**
+ * When using static libraries, calling this function ensures the IceDiscovery plug-in is
+ * linked with the application.
+ * @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
+ * If false, the plug-in is only loaded during communicator initialization if its corresponding
+ * plug-in property is set to 1.
+ */
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceDiscovery(bool loadOnInitialize = true);
 #endif
 
 #ifndef ICE_LOCATOR_DISCOVERY_API_EXPORTS
-ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceLocatorDiscovery(bool = true);
+/**
+ * When using static libraries, calling this function ensures the IceLocatorDiscovery plug-in is
+ * linked with the application.
+ * @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
+ * If false, the plug-in is only loaded during communicator initialization if its corresponding
+ * plug-in property is set to 1.
+ */
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceLocatorDiscovery(bool loadOnInitialize = true);
+#endif
+
+#if !defined(_WIN32) && !defined(__APPLE__)
+#   ifndef ICEBT_API_EXPORTS
+/**
+ * When using static libraries, calling this function ensures the IceBT plug-in is
+ * linked with the application.
+ * @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
+ * If false, the plug-in is only loaded during communicator initialization if its corresponding
+ * plug-in property is set to 1.
+ */
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceBT(bool loadOnInitialize = true);
+#   endif
+#endif
+
+#if defined(__APPLE__) && TARGET_OS_IPHONE != 0
+#   ifndef ICEIAP_API_EXPORTS
+/**
+ * When using static libraries, calling this function ensures the iAP plug-in is
+ * linked with the application.
+ * @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
+ * If false, the plug-in is only loaded during communicator initialization if its corresponding
+ * plug-in property is set to 1.
+ */
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceIAP(bool loadOnInitialize = true);
+#   endif
 #endif
 
+#if defined(_MSC_VER) && !defined(ICE_BUILDING_SRC)
+#   pragma comment(lib, ICE_LIBNAME("IceDiscovery"))
+#   pragma comment(lib, ICE_LIBNAME("IceLocatorDiscovery"))
+#   pragma comment(lib, ICE_LIBNAME("IceSSL"))
+#endif
 }
 
 #endif