zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/include/{Ice → generated/Ice}/RouterF.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -24,36 +24,63 @@
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
 #include <Ice/Exception.h>
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
 #include <Ice/Proxy.h>
 #include <IceUtil/ScopedArray.h>
-#include <IceUtil/Optional.h>
+#include <Ice/Optional.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_API
-#   ifdef ICE_API_EXPORTS
-#       define ICE_API ICE_DECLSPEC_EXPORT
-#   elif defined(ICE_STATIC_LIBS)
+#   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/
+#   elif defined(ICE_API_EXPORTS)
+#       define ICE_API ICE_DECLSPEC_EXPORT
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace Ice
+{
+
+class Router;
+class RouterPrx;
+
+}
+
+namespace Ice
+{
+
+}
+
+namespace Ice
+{
+
+using RouterPtr = ::std::shared_ptr<Router>;
+using RouterPrxPtr = ::std::shared_ptr<RouterPrx>;
+
+}
+
+#else // C++98 mapping
+
 namespace IceProxy
 {
 
@@ -61,7 +88,7 @@ namespace Ice
 {
 
 class Router;
-ICE_API void __read(::IceInternal::BasicStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router>&);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router>&);
 ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
 
 }
@@ -75,9 +102,17 @@ class Router;
 ICE_API ::Ice::Object* upCast(::Ice::Router*);
 typedef ::IceInternal::Handle< ::Ice::Router> RouterPtr;
 typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router> RouterPrx;
-ICE_API void __patch(RouterPtr&, const ::Ice::ObjectPtr&);
+typedef RouterPrx RouterPrxPtr;
+ICE_API void _icePatchObjectPtr(RouterPtr&, const ::Ice::ObjectPtr&);
 
 }
 
+namespace Ice
+{
+
+}
+
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif

data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocator.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -24,37 +24,80 @@
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
 #include <Ice/Exception.h>
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
 #include <IceUtil/ScopedArray.h>
-#include <IceUtil/Optional.h>
+#include <Ice/Optional.h>
 #include <Ice/ObjectAdapterF.h>
 #include <Ice/Current.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_API
-#   ifdef ICE_API_EXPORTS
-#       define ICE_API ICE_DECLSPEC_EXPORT
-#   elif defined(ICE_STATIC_LIBS)
+#   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/
+#   elif defined(ICE_API_EXPORTS)
+#       define ICE_API ICE_DECLSPEC_EXPORT
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace Ice
+{
+
+class ServantLocator;
+
+}
+
+namespace Ice
+{
+
+class ICE_CLASS(ICE_API) ServantLocator
+{
+public:
+
+    ICE_MEMBER(ICE_API) virtual ~ServantLocator();
+
+    virtual ::std::shared_ptr<::Ice::Object> locate(const ::Ice::Current&, ::std::shared_ptr<void>&) = 0;
+
+    virtual void finished(const ::Ice::Current&, const ::std::shared_ptr<::Ice::Object>&, const ::std::shared_ptr<void>&) = 0;
+
+    virtual void deactivate(const ::std::string&) = 0;
+};
+
+}
+
+namespace Ice
+{
+
+}
+
+namespace Ice
+{
+
+using ServantLocatorPtr = ::std::shared_ptr<ServantLocator>;
+
+}
+
+#else // C++98 mapping
+
 namespace Ice
 {
 
@@ -67,12 +110,14 @@ typedef ::IceInternal::Handle< ::Ice::ServantLocator> ServantLocatorPtr;
 namespace Ice
 {
 
-class ICE_API ServantLocator : virtual public ::Ice::LocalObject
+class ICE_API ServantLocator : public virtual ::Ice::LocalObject
 {
 public:
 
     typedef ServantLocatorPtr PointerType;
 
+    virtual ~ServantLocator();
+
     virtual ::Ice::ObjectPtr locate(const ::Ice::Current&, ::Ice::LocalObjectPtr&) = 0;
 
     virtual void finished(const ::Ice::Current&, const ::Ice::ObjectPtr&, const ::Ice::LocalObjectPtr&) = 0;
@@ -80,17 +125,24 @@ public:
     virtual void deactivate(const ::std::string&) = 0;
 };
 
-inline bool operator==(const ServantLocator& l, const ServantLocator& r)
+inline bool operator==(const ServantLocator& lhs, const ServantLocator& rhs)
 {
-    return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
+    return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
 }
 
-inline bool operator<(const ServantLocator& l, const ServantLocator& r)
+inline bool operator<(const ServantLocator& lhs, const ServantLocator& rhs)
 {
-    return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
+    return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
 }
 
 }
 
+namespace Ice
+{
+
+}
+
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif

data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -24,35 +24,60 @@
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
 #include <Ice/Exception.h>
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
 #include <IceUtil/ScopedArray.h>
-#include <IceUtil/Optional.h>
+#include <Ice/Optional.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_API
-#   ifdef ICE_API_EXPORTS
-#       define ICE_API ICE_DECLSPEC_EXPORT
-#   elif defined(ICE_STATIC_LIBS)
+#   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/
+#   elif defined(ICE_API_EXPORTS)
+#       define ICE_API ICE_DECLSPEC_EXPORT
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace Ice
+{
+
+class ServantLocator;
+
+}
+
+namespace Ice
+{
+
+}
+
+namespace Ice
+{
+
+using ServantLocatorPtr = ::std::shared_ptr<ServantLocator>;
+
+}
+
+#else // C++98 mapping
+
 namespace Ice
 {
 
@@ -62,5 +87,12 @@ typedef ::IceInternal::Handle< ::Ice::ServantLocator> ServantLocatorPtr;
 
 }
 
+namespace Ice
+{
+
+}
+
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif

data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -24,35 +24,48 @@
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
 #include <Ice/Exception.h>
 #include <Ice/LocalObject.h>
 #include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
 #include <IceUtil/ScopedArray.h>
-#include <IceUtil/Optional.h>
+#include <Ice/Optional.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 306
+#   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_API
-#   ifdef ICE_API_EXPORTS
-#       define ICE_API ICE_DECLSPEC_EXPORT
-#   elif defined(ICE_STATIC_LIBS)
+#   if defined(ICE_STATIC_LIBS)
 #       define ICE_API /**/
+#   elif defined(ICE_API_EXPORTS)
+#       define ICE_API ICE_DECLSPEC_EXPORT
 #   else
 #       define ICE_API ICE_DECLSPEC_IMPORT
 #   endif
 #endif
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace Ice
+{
+
+using SliceChecksumDict = ::std::map<::std::string, ::std::string>;
+
+}
+
+#else // C++98 mapping
+
 namespace Ice
 {
 
@@ -60,5 +73,7 @@ typedef ::std::map< ::std::string, ::std::string> SliceChecksumDict;
 
 }
 
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif

data/ext/ice/cpp/include/generated/Ice/ValueFactory.h

@@ -0,0 +1,169 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+//
+// Ice version 3.7.0
+//
+// <auto-generated>
+//
+// Generated from file `ValueFactory.ice'
+//
+// Warning: do not edit this file.
+//
+// </auto-generated>
+//
+
+#ifndef __Ice_ValueFactory_h__
+#define __Ice_ValueFactory_h__
+
+#include <IceUtil/PushDisableWarnings.h>
+#include <Ice/ProxyF.h>
+#include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
+#include <Ice/Exception.h>
+#include <Ice/LocalObject.h>
+#include <Ice/StreamHelpers.h>
+#include <Ice/Comparable.h>
+#include <IceUtil/ScopedArray.h>
+#include <Ice/Optional.h>
+#include <IceUtil/UndefSysMacros.h>
+
+#ifndef ICE_IGNORE_VERSION
+#   if ICE_INT_VERSION / 100 != 307
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
+#   endif
+#endif
+
+#ifndef ICE_API
+#   if defined(ICE_STATIC_LIBS)
+#       define ICE_API /**/
+#   elif defined(ICE_API_EXPORTS)
+#       define ICE_API ICE_DECLSPEC_EXPORT
+#   else
+#       define ICE_API ICE_DECLSPEC_IMPORT
+#   endif
+#endif
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+namespace Ice
+{
+
+class ValueFactoryManager;
+
+}
+
+namespace Ice
+{
+
+using ValueFactory = ::std::function<::std::shared_ptr<::Ice::Value>(const ::std::string&)>;
+
+class ICE_CLASS(ICE_API) ValueFactoryManager
+{
+public:
+
+    ICE_MEMBER(ICE_API) virtual ~ValueFactoryManager();
+
+    virtual void add(::Ice::ValueFactory, const ::std::string&) = 0;
+
+    virtual ::Ice::ValueFactory find(const ::std::string&) const = 0;
+};
+
+}
+
+namespace Ice
+{
+
+}
+
+namespace Ice
+{
+
+using ValueFactoryManagerPtr = ::std::shared_ptr<ValueFactoryManager>;
+
+}
+
+#else // C++98 mapping
+
+namespace Ice
+{
+
+class ValueFactory;
+ICE_API ::Ice::LocalObject* upCast(::Ice::ValueFactory*);
+typedef ::IceInternal::Handle< ::Ice::ValueFactory> ValueFactoryPtr;
+
+class ValueFactoryManager;
+ICE_API ::Ice::LocalObject* upCast(::Ice::ValueFactoryManager*);
+typedef ::IceInternal::Handle< ::Ice::ValueFactoryManager> ValueFactoryManagerPtr;
+
+}
+
+namespace Ice
+{
+
+class ICE_API ValueFactory : public virtual ::Ice::LocalObject
+{
+public:
+
+    typedef ValueFactoryPtr PointerType;
+
+    virtual ~ValueFactory();
+
+    virtual ::Ice::ValuePtr create(const ::std::string&) = 0;
+};
+
+inline bool operator==(const ValueFactory& lhs, const ValueFactory& rhs)
+{
+    return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
+}
+
+inline bool operator<(const ValueFactory& lhs, const ValueFactory& rhs)
+{
+    return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
+}
+
+class ICE_API ValueFactoryManager : public virtual ::Ice::LocalObject
+{
+public:
+
+    typedef ValueFactoryManagerPtr PointerType;
+
+    virtual ~ValueFactoryManager();
+
+    virtual void add(const ::Ice::ValueFactoryPtr&, const ::std::string&) = 0;
+
+    virtual ::Ice::ValueFactoryPtr find(const ::std::string&) const = 0;
+};
+
+inline bool operator==(const ValueFactoryManager& lhs, const ValueFactoryManager& rhs)
+{
+    return static_cast<const ::Ice::LocalObject&>(lhs) == static_cast<const ::Ice::LocalObject&>(rhs);
+}
+
+inline bool operator<(const ValueFactoryManager& lhs, const ValueFactoryManager& rhs)
+{
+    return static_cast<const ::Ice::LocalObject&>(lhs) < static_cast<const ::Ice::LocalObject&>(rhs);
+}
+
+}
+
+namespace Ice
+{
+
+}
+
+#endif
+
+#include <IceUtil/PopDisableWarnings.h>
+#endif