Update Version.ice and related files in C++ (#1975)

zeroc-ice · Mar 22, 2024 · 61bf5ef · 61bf5ef
1 parent c354678
commit 61bf5ef
Show file tree

Hide file tree

Showing 42 changed files with 366 additions and 463 deletions.
diff --git a/cpp/include/Ice/EncodingVersion.h b/cpp/include/Ice/EncodingVersion.h
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
@@ -33,13 +33,13 @@
 #    include "ObjectAdapter.h"
 #    include "Plugin.h"
 #    include "Properties.h"
-#    include "Protocol.h"
 #    include "ProxyFunctions.h"
 #    include "RegisterPlugins.h"
 #    include "ServantLocator.h"
 #    include "SlicedData.h"
 #    include "StringConverter.h"
 #    include "UUID.h"
+#    include "VersionFunctions.h"
 
 // Generated header files:
 #    include "Ice/EndpointTypes.h"

diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h
@@ -13,7 +13,6 @@
 #include "LoggerF.h"
 #include "InstrumentationF.h"
 #include "Ice/BuiltinSequences.h"
-#include "Ice/Version.h"
 #include "Plugin.h"
 #include "BatchRequestInterceptor.h"
 #include "ValueFactory.h"

diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h
@@ -12,7 +12,7 @@
 #include "LoggerF.h"
 #include "ValueFactory.h"
 #include "Buffer.h"
-#include "EncodingVersion.h"
+#include "Ice/Version.h"
 #include "SlicedDataF.h"
 #include "UserExceptionFactory.h"
 #include "ValueFactory.h"

diff --git a/cpp/include/Ice/LocalException.h b/cpp/include/Ice/LocalException.h
@@ -5,7 +5,6 @@
 #ifndef ICE_LOCAL_EXCEPTION_H
 #define ICE_LOCAL_EXCEPTION_H
 
-#include "EncodingVersion.h"
 #include "Exception.h"
 #include "Ice/BuiltinSequences.h"
 #include "Ice/Identity.h"

diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
@@ -16,7 +16,6 @@
 #include "ObserverHelper.h"
 #include "LocalException.h"
 #include "Proxy.h"
-#include "Protocol.h"
 
 #include <cassert>
 #include <exception>
@@ -74,17 +73,9 @@ namespace IceInternal
         void cancel();
 
         void
-        attachRemoteObserver(const Ice::ConnectionInfoPtr& c, const Ice::EndpointPtr& endpt, std::int32_t requestId)
-        {
-            const std::int32_t size = static_cast<std::int32_t>(_os.b.size() - headerSize - 4);
-            _childObserver.attach(getObserver().getRemoteObserver(c, endpt, requestId, size));
-        }
+        attachRemoteObserver(const Ice::ConnectionInfoPtr& c, const Ice::EndpointPtr& endpt, std::int32_t requestId);
 
-        void attachCollocatedObserver(const Ice::ObjectAdapterPtr& adapter, std::int32_t requestId)
-        {
-            const std::int32_t size = static_cast<std::int32_t>(_os.b.size() - headerSize - 4);
-            _childObserver.attach(getObserver().getCollocatedObserver(adapter, requestId, size));
-        }
+        void attachCollocatedObserver(const Ice::ObjectAdapterPtr& adapter, std::int32_t requestId);
 
         Ice::OutputStream* getOs() { return &_os; }
 

diff --git a/cpp/include/Ice/OutputStream.h b/cpp/include/Ice/OutputStream.h
@@ -10,7 +10,7 @@
 #include "ValueF.h"
 #include "ProxyF.h"
 #include "Buffer.h"
-#include "EncodingVersion.h"
+#include "Ice/Version.h"
 #include "SlicedDataF.h"
 #include "StreamableTraits.h"
 #include "Ice/Format.h"

diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
@@ -551,7 +551,19 @@ namespace Ice
         }
     };
 
-    // Specializations for EncodingVersion
+    // Specializations for ProtocolVersion and EncodingVersion
+
+    template<> struct StreamableTraits<ProtocolVersion>
+    {
+        static const StreamHelperCategory helper = StreamHelperCategoryStruct;
+        static const int minWireSize = 2;
+        static const bool fixedLength = true;
+    };
+
+    template<> struct StreamReader<ProtocolVersion>
+    {
+        static void read(InputStream* istr, ProtocolVersion& v) { istr->readAll(v.major, v.minor); }
+    };
 
     template<> struct StreamableTraits<EncodingVersion>
     {