zeroc-ice 3.6.5 → 3.7.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -10,51 +10,28 @@
 #ifndef ICE_PROXY_F_H
 #define ICE_PROXY_F_H
 
-#include <IceUtil/Shared.h>
-
 #include <Ice/Config.h>
 #include <Ice/ProxyHandle.h>
 
-namespace IceProxy
-{
-
-namespace Ice
-{
-
-class Object;
-inline Object* upCast(Object* o) { return o; }
-
-}
-
-}
-
-namespace IceDelegate
-{
-
+#ifdef ICE_CPP11_MAPPING
 namespace Ice
 {
 
-class Object;
-inline Object* upCast(Object* o) { return o; }
-
-}
+class ObjectPrx;
+using ObjectPrxPtr = ::std::shared_ptr<ObjectPrx>;
 
 }
 
-namespace IceDelegateM
+namespace IceInternal
 {
 
-namespace Ice
-{
-
-class Object;
-inline Object* upCast(Object* o) { return o; }
-
-}
+template<typename P>
+::std::shared_ptr<P> createProxy();
 
 }
 
-namespace IceDelegateD
+#else // C++98 mapping
+namespace IceProxy
 {
 
 namespace Ice
@@ -71,8 +48,9 @@ namespace Ice
 {
 
 typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx;
+typedef ObjectPrx ObjectPrxPtr;
 
 }
 
-
+#endif
 #endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/include/Ice/ProxyHandle.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -10,6 +10,8 @@
 #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 +25,8 @@ template<typename T> class Handle;
 
 }
 
-namespace IceProxy 
-{ 
+namespace IceProxy
+{
 namespace Ice
 {
 
@@ -42,18 +44,20 @@ class ObjectAdapter;
 typedef ::IceInternal::Handle< ::Ice::ObjectAdapter> ObjectAdapterPtr;
 
 typedef ::std::map< ::std::string, ::std::string> Context;
+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 +66,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 +81,8 @@ uncheckedCastHelper(const ::IceInternal::ProxyHandle<Y>& 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 +95,7 @@ checkedCastHelper(const ::IceInternal::ProxyHandle<Y>& 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 +118,7 @@ template<typename T>
 class ProxyHandle : public ::IceUtil::HandleBase<T>
 {
 public:
-    
+
     ProxyHandle(T* p = 0)
     {
         this->_ptr = p;
@@ -124,7 +128,7 @@ public:
             upCast(this->_ptr)->__incRef();
         }
     }
-    
+
     template<typename Y>
     ProxyHandle(const ProxyHandle<Y>& r)
     {
@@ -156,7 +160,7 @@ public:
             upCast(this->_ptr)->__incRef();
         }
     }
-    
+
     ~ProxyHandle()
     {
         if(this->_ptr)
@@ -164,7 +168,7 @@ public:
             upCast(this->_ptr)->__decRef();
         }
     }
-    
+
     ProxyHandle& operator=(T* p)
     {
         if(this->_ptr != p)
@@ -178,12 +182,12 @@ public:
             {
                 upCast(this->_ptr)->__decRef();
             }
-            
+
             this->_ptr = p;
         }
         return *this;
     }
-        
+
     template<typename Y>
     ProxyHandle& operator=(const ProxyHandle<Y>& r)
     {
@@ -198,7 +202,7 @@ public:
             {
                 upCast(this->_ptr)->__decRef();
             }
-            
+
             this->_ptr = r._ptr;
         }
         return *this;
@@ -218,7 +222,7 @@ public:
             {
                 upCast(this->_ptr)->__decRef();
             }
-            
+
             this->_ptr = r._ptr;
         }
         return *this;
@@ -237,29 +241,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 +274,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 +310,5 @@ std::ostream& operator<<(std::ostream& os, ::IceInternal::ProxyHandle<Y> p)
 }
 
 #endif
+
+#endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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/include/Ice/RegisterPlugins.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -16,7 +16,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.
 //
 
@@ -36,9 +36,11 @@ namespace Ice
 
 #ifndef ICE_API_EXPORTS
 ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceStringConverter(bool = true);
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceUDP(bool = true);
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceWS(bool = true);
 #endif
 
-#ifndef ICE_SSL_API_EXPORTS
+#ifndef ICESSL_API_EXPORTS
 ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceSSL(bool = true);
 #endif
 
@@ -50,6 +52,23 @@ ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceDiscovery(bool = true);
 ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceLocatorDiscovery(bool = true);
 #endif
 
+#if !defined(_WIN32) && !defined(__APPLE__)
+#   ifndef ICEBT_API_EXPORTS
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceBT(bool = true);
+#   endif
+#endif
+
+#if defined(__APPLE__) && TARGET_OS_IPHONE != 0
+#   ifndef ICEIAP_API_EXPORTS
+ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceIAP(bool = 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

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -16,14 +16,20 @@
 namespace IceInternal
 {
 
+class CancellationHandler;
 class RequestHandler;
-ICE_API IceUtil::Shared* upCast(RequestHandler*);
-typedef IceInternal::Handle<RequestHandler> RequestHandlerPtr;
 
-class CancellationHandler;
+#ifdef ICE_CPP11_MAPPING
+using CancellationHandlerPtr = ::std::shared_ptr<CancellationHandler>;
+using RequestHandlerPtr = ::std::shared_ptr<RequestHandler>;
+#else
 ICE_API IceUtil::Shared* upCast(CancellationHandler*);
 typedef IceInternal::Handle<CancellationHandler> CancellationHandlerPtr;
 
+ICE_API IceUtil::Shared* upCast(RequestHandler*);
+typedef IceInternal::Handle<RequestHandler> RequestHandlerPtr;
+#endif
+
 }
 
 #endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -17,8 +17,13 @@ namespace IceInternal
 {
 
 class ResponseHandler;
+
+#ifdef ICE_CPP11_MAPPING
+using ResponseHandlerPtr = ::std::shared_ptr<ResponseHandler>;
+#else
 ICE_API IceUtil::Shared* upCast(ResponseHandler*);
 typedef IceInternal::Handle<ResponseHandler> ResponseHandlerPtr;
+#endif
 
 }
 

data/ext/ice/cpp/include/{IceUtil → Ice}/SHA1.h

@@ -1,45 +1,45 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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_UTIL_SHA1_H
-#define ICE_UTIL_SHA1_H
+#ifndef ICE_SHA1_H
+#define ICE_SHA1_H
 
-#include <IceUtil/Config.h>
-#include <IceUtil/UniquePtr.h>
+#include <Ice/Config.h>
+#include <Ice/UniquePtr.h>
 
 #include <vector>
 
-namespace IceUtilInternal
+namespace IceInternal
 {
 
-ICE_UTIL_API void 
+ICE_API void
 sha1(const unsigned char*, std::size_t, std::vector<unsigned char>&);
-    
-#ifndef ICE_OS_WINRT
-class ICE_UTIL_API SHA1
+
+#ifndef ICE_OS_UWP
+class ICE_API SHA1
 {
 public:
-    
+
     SHA1();
     ~SHA1();
-    
+
     void update(const unsigned char*, std::size_t);
     void finalize(std::vector<unsigned char>&);
-    
+
 private:
-    
+
     // noncopyable
     SHA1(const SHA1&);
     SHA1 operator=(const SHA1&);
-    
+
     class Hasher;
-    IceUtil::UniquePtr<Hasher> _hasher;
+    UniquePtr<Hasher> _hasher;
 };
 #endif