zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointF.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,82 @@
 #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 EndpointInfo;
+class IPEndpointInfo;
+class TCPEndpointInfo;
+class UDPEndpointInfo;
+class WSEndpointInfo;
+class Endpoint;
+
+}
+
+namespace Ice
+{
+
+using EndpointSeq = ::std::vector<::std::shared_ptr<::Ice::Endpoint>>;
+
+}
+
+namespace Ice
+{
+
+}
+
+namespace Ice
+{
+
+using EndpointInfoPtr = ::std::shared_ptr<EndpointInfo>;
+
+using IPEndpointInfoPtr = ::std::shared_ptr<IPEndpointInfo>;
+
+using TCPEndpointInfoPtr = ::std::shared_ptr<TCPEndpointInfo>;
+
+using UDPEndpointInfoPtr = ::std::shared_ptr<UDPEndpointInfo>;
+
+using WSEndpointInfoPtr = ::std::shared_ptr<WSEndpointInfo>;
+
+using EndpointPtr = ::std::shared_ptr<Endpoint>;
+
+}
+
+#else // C++98 mapping
+
 namespace Ice
 {
 
@@ -89,5 +136,12 @@ typedef ::std::vector< ::Ice::EndpointPtr> EndpointSeq;
 
 }
 
+namespace Ice
+{
+
+}
+
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif

data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointTypes.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,39 +24,43 @@
 #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
 {
 
-enum EndpointSelectionType
+enum class EndpointSelectionType : unsigned char
 {
     Random,
     Ordered
@@ -66,17 +70,28 @@ enum EndpointSelectionType
 
 namespace Ice
 {
-template<>
-struct StreamableTraits< ::Ice::EndpointSelectionType>
+
+}
+
+#else // C++98 mapping
+
+namespace Ice
 {
-    static const StreamHelperCategory helper = StreamHelperCategoryEnum;
-    static const int minValue = 0;
-    static const int maxValue = 1;
-    static const int minWireSize = 1;
-    static const bool fixedLength = false;
+
+enum EndpointSelectionType
+{
+    Random,
+    Ordered
 };
 
 }
 
+namespace Ice
+{
+
+}
+
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif

data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.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 FacetMap = ::std::map<::std::string, ::std::shared_ptr<::Ice::Object>>;
+
+}
+
+#else // C++98 mapping
+
 namespace Ice
 {
 
@@ -60,5 +73,7 @@ typedef ::std::map< ::std::string, ::Ice::ObjectPtr> FacetMap;
 
 }
 
+#endif
+
 #include <IceUtil/PopDisableWarnings.h>
 #endif

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

@@ -0,0 +1,221 @@
+// **********************************************************************
+//
+// 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 `Identity.ice'
+//
+// Warning: do not edit this file.
+//
+// </auto-generated>
+//
+
+#ifndef __Ice_Identity_h__
+#define __Ice_Identity_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
+{
+
+struct Identity
+{
+    ::std::string name;
+    ::std::string category;
+
+    std::tuple<const ::std::string&, const ::std::string&> ice_tuple() const
+    {
+        return std::tie(name, category);
+    }
+};
+
+using ObjectDict = ::std::map<::Ice::Identity, ::std::shared_ptr<::Ice::Object>>;
+
+using IdentitySeq = ::std::vector<::Ice::Identity>;
+
+using Ice::operator<;
+using Ice::operator<=;
+using Ice::operator>;
+using Ice::operator>=;
+using Ice::operator==;
+using Ice::operator!=;
+
+}
+
+namespace Ice
+{
+
+template<>
+struct StreamableTraits<::Ice::Identity>
+{
+    static const StreamHelperCategory helper = StreamHelperCategoryStruct;
+    static const int minWireSize = 2;
+    static const bool fixedLength = false;
+};
+
+template<typename S>
+struct StreamReader<::Ice::Identity, S>
+{
+    static void read(S* istr, ::Ice::Identity& v)
+    {
+        istr->readAll(v.name, v.category);
+    }
+};
+
+}
+
+#else // C++98 mapping
+
+namespace Ice
+{
+
+struct Identity
+{
+    ::std::string name;
+    ::std::string category;
+
+    bool operator==(const Identity& rhs_) const
+    {
+        if(this == &rhs_)
+        {
+            return true;
+        }
+        if(name != rhs_.name)
+        {
+            return false;
+        }
+        if(category != rhs_.category)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    bool operator<(const Identity& rhs_) const
+    {
+        if(this == &rhs_)
+        {
+            return false;
+        }
+        if(name < rhs_.name)
+        {
+            return true;
+        }
+        else if(rhs_.name < name)
+        {
+            return false;
+        }
+        if(category < rhs_.category)
+        {
+            return true;
+        }
+        else if(rhs_.category < category)
+        {
+            return false;
+        }
+        return false;
+    }
+
+    bool operator!=(const Identity& rhs_) const
+    {
+        return !operator==(rhs_);
+    }
+    bool operator<=(const Identity& rhs_) const
+    {
+        return operator<(rhs_) || operator==(rhs_);
+    }
+    bool operator>(const Identity& rhs_) const
+    {
+        return !operator<(rhs_) && !operator==(rhs_);
+    }
+    bool operator>=(const Identity& rhs_) const
+    {
+        return !operator<(rhs_);
+    }
+};
+
+typedef ::std::map< ::Ice::Identity, ::Ice::ObjectPtr> ObjectDict;
+
+typedef ::std::vector< ::Ice::Identity> IdentitySeq;
+
+}
+
+namespace Ice
+{
+
+template<>
+struct StreamableTraits< ::Ice::Identity>
+{
+    static const StreamHelperCategory helper = StreamHelperCategoryStruct;
+    static const int minWireSize = 2;
+    static const bool fixedLength = false;
+};
+
+template<typename S>
+struct StreamWriter< ::Ice::Identity, S>
+{
+    static void write(S* ostr, const ::Ice::Identity& v)
+    {
+        ostr->write(v.name);
+        ostr->write(v.category);
+    }
+};
+
+template<typename S>
+struct StreamReader< ::Ice::Identity, S>
+{
+    static void read(S* istr, ::Ice::Identity& v)
+    {
+        istr->read(v.name);
+        istr->read(v.category);
+    }
+};
+
+}
+
+#endif
+
+#include <IceUtil/PopDisableWarnings.h>
+#endif