zeroc-ice 3.7.11 → 3.8.1

data/dist/ice/cpp/include/generated/Ice/SliceChecksumDict.h

@@ -1,84 +1,37 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.11
-//
-// <auto-generated>
-//
-// Generated from file `SliceChecksumDict.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
+// Copyright (c) ZeroC, Inc.
 
-#ifndef __Ice_SliceChecksumDict_h__
-#define __Ice_SliceChecksumDict_h__
+// slice2cpp version 3.8.1
+// <auto-generated>Generated from Slice file 'SliceChecksumDict.ice'.</auto-generated>
+// clang-format off
 
-#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_SliceChecksumDict_h_
+#define Ice_SliceChecksumDict_h_
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
+#include <Ice/PushDisableWarnings.h>
+#include <Ice/Ice.h>
+
+#ifndef ICE_DISABLE_VERSION
+#   if ICE_INT_VERSION / 100 != 308
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 11
+#   if ICE_INT_VERSION % 100 < 1
 #       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
-{
-
-/**
- * A mapping from type IDs to Slice checksums. The dictionary
- * allows verification at run time that client and server
- * use matching Slice definitions.
- */
-using SliceChecksumDict = ::std::map<::std::string, ::std::string>;
-
-}
-
-#else // C++98 mapping
+// NOLINTBEGIN(modernize-concat-nested-namespaces)
 
 namespace Ice
 {
-
-/**
- * A mapping from type IDs to Slice checksums. The dictionary
- * allows verification at run time that client and server
- * use matching Slice definitions.
- */
-typedef ::std::map< ::std::string, ::std::string> SliceChecksumDict;
-
+    /// Mapping from type IDs to Slice checksums. This dictionary allows verification at runtime that a client and a
+    /// server use essentially the same Slice definitions.
+    using SliceChecksumDict [[deprecated("As of Ice 3.8, the Slice compilers no longer generate Slice checksums.")]] = std::map<std::string, std::string>;
 }
 
-#endif
+// NOLINTEND(modernize-concat-nested-namespaces)
 
-#include <IceUtil/PopDisableWarnings.h>
+#include <Ice/PopDisableWarnings.h>
 #endif

data/dist/ice/cpp/include/generated/Ice/Version.h

@@ -1,357 +1,112 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.11
-//
-// <auto-generated>
-//
-// Generated from file `Version.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
+// Copyright (c) ZeroC, Inc.
 
-#ifndef __Ice_Version_h__
-#define __Ice_Version_h__
+// slice2cpp version 3.8.1
+// <auto-generated>Generated from Slice file 'Version.ice'.</auto-generated>
+// clang-format off
 
-#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_Version_h_
+#define Ice_Version_h_
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
+#include <Ice/PushDisableWarnings.h>
+#include <Ice/Config.h>
+#include <Ice/TupleCompare.h>
+#include <cstdint>
+#include <ostream>
+
+#ifndef ICE_DISABLE_VERSION
+#   if ICE_INT_VERSION / 100 != 308
 #       error Ice version mismatch!
 #   endif
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 11
+#   if ICE_INT_VERSION % 100 < 1
 #       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
+// NOLINTBEGIN(modernize-concat-nested-namespaces)
 
 namespace Ice
 {
+    struct ProtocolVersion;
 
-/**
- * A version structure for the protocol version.
- * \headerfile Ice/Ice.h
- */
-struct ProtocolVersion
-{
-    ::Ice::Byte major;
-    ::Ice::Byte minor;
-
-    /**
-     * Obtains a tuple containing all of the struct's data members.
-     * @return The data members in a tuple.
-     */
-    std::tuple<const ::Ice::Byte&, const ::Ice::Byte&> ice_tuple() const
-    {
-        return std::tie(major, minor);
-    }
-};
-
-/**
- * A version structure for the encoding version.
- * \headerfile Ice/Ice.h
- */
-struct EncodingVersion
-{
-    ::Ice::Byte major;
-    ::Ice::Byte minor;
-
-    /**
-     * Obtains a tuple containing all of the struct's data members.
-     * @return The data members in a tuple.
-     */
-    std::tuple<const ::Ice::Byte&, const ::Ice::Byte&> ice_tuple() const
-    {
-        return std::tie(major, minor);
-    }
-};
-
-using Ice::operator<;
-using Ice::operator<=;
-using Ice::operator>;
-using Ice::operator>=;
-using Ice::operator==;
-using Ice::operator!=;
-
+    struct EncodingVersion;
 }
 
-/// \cond STREAM
 namespace Ice
 {
-
-template<>
-struct StreamableTraits<::Ice::ProtocolVersion>
-{
-    static const StreamHelperCategory helper = StreamHelperCategoryStruct;
-    static const int minWireSize = 2;
-    static const bool fixedLength = true;
-};
-
-template<typename S>
-struct StreamReader<::Ice::ProtocolVersion, S>
-{
-    static void read(S* istr, ::Ice::ProtocolVersion& v)
+    /// Represents a version of the Ice protocol. The only version implemented and supported by Ice is version 1.0.
+    /// @remarks The Slice compiler generated this struct from Slice struct `::Ice::ProtocolVersion`.
+    /// @headerfile Ice/Ice.h
+    struct ProtocolVersion
     {
-        istr->readAll(v.major, v.minor);
-    }
-};
-
-template<>
-struct StreamableTraits<::Ice::EncodingVersion>
-{
-    static const StreamHelperCategory helper = StreamHelperCategoryStruct;
-    static const int minWireSize = 2;
-    static const bool fixedLength = true;
-};
-
-template<typename S>
-struct StreamReader<::Ice::EncodingVersion, S>
-{
-    static void read(S* istr, ::Ice::EncodingVersion& v)
-    {
-        istr->readAll(v.major, v.minor);
-    }
-};
-
-}
-/// \endcond
-
-#else // C++98 mapping
-
-namespace Ice
-{
+        /// The major version of the Ice protocol.
+        std::uint8_t major;
 
-/**
- * A version structure for the protocol version.
- * \headerfile Ice/Ice.h
- */
-struct ProtocolVersion
-{
-    ::Ice::Byte major;
-    ::Ice::Byte minor;
+        /// The minor version of the Ice protocol.
+        std::uint8_t minor;
 
-    bool operator==(const ProtocolVersion& rhs_) const
-    {
-        if(this == &rhs_)
-        {
-            return true;
-        }
-        if(major != rhs_.major)
-        {
-            return false;
-        }
-        if(minor != rhs_.minor)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    bool operator<(const ProtocolVersion& rhs_) const
-    {
-        if(this == &rhs_)
-        {
-            return false;
-        }
-        if(major < rhs_.major)
-        {
-            return true;
-        }
-        else if(rhs_.major < major)
-        {
-            return false;
-        }
-        if(minor < rhs_.minor)
-        {
-            return true;
-        }
-        else if(rhs_.minor < minor)
+        /// Creates a tuple with all the fields of this struct.
+        /// @return A tuple with all the fields of this struct.
+        [[nodiscard]] std::tuple<const std::uint8_t&, const std::uint8_t&> ice_tuple() const
         {
-            return false;
+            return std::tie(major, minor);
         }
-        return false;
-    }
 
-    bool operator!=(const ProtocolVersion& rhs_) const
-    {
-        return !operator==(rhs_);
-    }
-    bool operator<=(const ProtocolVersion& rhs_) const
-    {
-        return operator<(rhs_) || operator==(rhs_);
-    }
-    bool operator>(const ProtocolVersion& rhs_) const
-    {
-        return !operator<(rhs_) && !operator==(rhs_);
-    }
-    bool operator>=(const ProtocolVersion& rhs_) const
-    {
-        return !operator<(rhs_);
-    }
-};
+        /// Outputs the name and value of each field of this instance to the stream.
+        /// @param os The output stream.
+        ICE_API void ice_printFields(std::ostream& os) const;
+    };
 
-/**
- * A version structure for the encoding version.
- * \headerfile Ice/Ice.h
- */
-struct EncodingVersion
-{
-    ::Ice::Byte major;
-    ::Ice::Byte minor;
+    /// Outputs the description of a ProtocolVersion to a stream, including all its fields.
+    /// @param os The output stream.
+    /// @param value The instance to output.
+    /// @return The output stream.
+    ICE_API std::ostream& operator<<(std::ostream& os, const ProtocolVersion& value);
 
-    bool operator==(const EncodingVersion& rhs_) const
+    /// Represents a version of the Slice encoding. Ice supports version 1.0 and 1.1 of this encoding.
+    /// @remarks The Slice encoding is also known as the Ice encoding.
+    ///
+    /// The Slice compiler generated this struct from Slice struct `::Ice::EncodingVersion`.
+    /// @headerfile Ice/Ice.h
+    struct EncodingVersion
     {
-        if(this == &rhs_)
-        {
-            return true;
-        }
-        if(major != rhs_.major)
-        {
-            return false;
-        }
-        if(minor != rhs_.minor)
-        {
-            return false;
-        }
-        return true;
-    }
+        /// The major version of the Slice encoding.
+        std::uint8_t major;
 
-    bool operator<(const EncodingVersion& rhs_) const
-    {
-        if(this == &rhs_)
-        {
-            return false;
-        }
-        if(major < rhs_.major)
-        {
-            return true;
-        }
-        else if(rhs_.major < major)
-        {
-            return false;
-        }
-        if(minor < rhs_.minor)
-        {
-            return true;
-        }
-        else if(rhs_.minor < minor)
+        /// The minor version of the Slice encoding.
+        std::uint8_t minor;
+
+        /// Creates a tuple with all the fields of this struct.
+        /// @return A tuple with all the fields of this struct.
+        [[nodiscard]] std::tuple<const std::uint8_t&, const std::uint8_t&> ice_tuple() const
         {
-            return false;
+            return std::tie(major, minor);
         }
-        return false;
-    }
-
-    bool operator!=(const EncodingVersion& rhs_) const
-    {
-        return !operator==(rhs_);
-    }
-    bool operator<=(const EncodingVersion& rhs_) const
-    {
-        return operator<(rhs_) || operator==(rhs_);
-    }
-    bool operator>(const EncodingVersion& rhs_) const
-    {
-        return !operator<(rhs_) && !operator==(rhs_);
-    }
-    bool operator>=(const EncodingVersion& rhs_) const
-    {
-        return !operator<(rhs_);
-    }
-};
-
-}
-
-/// \cond STREAM
-namespace Ice
-{
 
-template<>
-struct StreamableTraits< ::Ice::ProtocolVersion>
-{
-    static const StreamHelperCategory helper = StreamHelperCategoryStruct;
-    static const int minWireSize = 2;
-    static const bool fixedLength = true;
-};
+        /// Outputs the name and value of each field of this instance to the stream.
+        /// @param os The output stream.
+        ICE_API void ice_printFields(std::ostream& os) const;
+    };
 
-template<typename S>
-struct StreamWriter< ::Ice::ProtocolVersion, S>
-{
-    static void write(S* ostr, const ::Ice::ProtocolVersion& v)
-    {
-        ostr->write(v.major);
-        ostr->write(v.minor);
-    }
-};
-
-template<typename S>
-struct StreamReader< ::Ice::ProtocolVersion, S>
-{
-    static void read(S* istr, ::Ice::ProtocolVersion& v)
-    {
-        istr->read(v.major);
-        istr->read(v.minor);
-    }
-};
-
-template<>
-struct StreamableTraits< ::Ice::EncodingVersion>
-{
-    static const StreamHelperCategory helper = StreamHelperCategoryStruct;
-    static const int minWireSize = 2;
-    static const bool fixedLength = true;
-};
-
-template<typename S>
-struct StreamWriter< ::Ice::EncodingVersion, S>
-{
-    static void write(S* ostr, const ::Ice::EncodingVersion& v)
-    {
-        ostr->write(v.major);
-        ostr->write(v.minor);
-    }
-};
-
-template<typename S>
-struct StreamReader< ::Ice::EncodingVersion, S>
-{
-    static void read(S* istr, ::Ice::EncodingVersion& v)
-    {
-        istr->read(v.major);
-        istr->read(v.minor);
-    }
-};
+    /// Outputs the description of an EncodingVersion to a stream, including all its fields.
+    /// @param os The output stream.
+    /// @param value The instance to output.
+    /// @return The output stream.
+    ICE_API std::ostream& operator<<(std::ostream& os, const EncodingVersion& value);
 
+    /// @cond INTERNAL
+    using Ice::Tuple::operator<;
+    using Ice::Tuple::operator<=;
+    using Ice::Tuple::operator>;
+    using Ice::Tuple::operator>=;
+    using Ice::Tuple::operator==;
+    using Ice::Tuple::operator!=;
+    /// @endcond
 }
-/// \endcond
 
-#endif
+// NOLINTEND(modernize-concat-nested-namespaces)
 
-#include <IceUtil/PopDisableWarnings.h>
+#include <Ice/PopDisableWarnings.h>
 #endif