zeroc-ice 3.7.11 → 3.8.1

data/dist/ice/cpp/src/Ice/WSTransceiver.h

@@ -1,141 +1,135 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_WS_TRANSCEIVER_I_H
 #define ICE_WS_TRANSCEIVER_I_H
 
-#include <Ice/ProtocolInstance.h>
-#include <Ice/HttpParser.h>
-
-#include <Ice/LoggerF.h>
-#include <Ice/Transceiver.h>
-#include <Ice/Network.h>
-#include <Ice/Buffer.h>
+#include "HttpParser.h"
+#include "Ice/Buffer.h"
+#include "Ice/Logger.h"
+#include "Network.h"
+#include "ProtocolInstance.h"
+#include "Transceiver.h"
 
 namespace IceInternal
 {
+    class ConnectorI;
+    class AcceptorI;
 
-class ConnectorI;
-class AcceptorI;
-
-class WSTransceiver : public Transceiver
-{
-public:
+    class WSTransceiver final : public Transceiver
+    {
+    public:
+        WSTransceiver(ProtocolInstancePtr, TransceiverPtr, std::string, std::string);
+        WSTransceiver(ProtocolInstancePtr, TransceiverPtr);
+        ~WSTransceiver();
 
-    virtual NativeInfoPtr getNativeInfo();
+        NativeInfoPtr getNativeInfo() final;
 #if defined(ICE_USE_IOCP)
-    virtual AsyncInfo* getAsyncInfo(SocketOperation);
+        AsyncInfo* getAsyncInfo(SocketOperation);
 #endif
 
-    virtual SocketOperation initialize(Buffer&, Buffer&);
-    virtual SocketOperation closing(bool, const Ice::LocalException&);
-    virtual void close();
-    virtual SocketOperation write(Buffer&);
-    virtual SocketOperation read(Buffer&);
+        SocketOperation initialize(Buffer&, Buffer&) final;
+        SocketOperation closing(bool, std::exception_ptr) final;
+        void close() final;
+        SocketOperation write(Buffer&) final;
+        SocketOperation read(Buffer&) final;
 #if defined(ICE_USE_IOCP)
-    virtual bool startWrite(Buffer&);
-    virtual void finishWrite(Buffer&);
-    virtual void startRead(Buffer&);
-    virtual void finishRead(Buffer&);
+        bool startWrite(Buffer&) final;
+        void finishWrite(Buffer&) final;
+        void startRead(Buffer&) final;
+        void finishRead(Buffer&) final;
 #endif
-    virtual std::string protocol() const;
-    virtual std::string toString() const;
-    virtual std::string toDetailedString() const;
-    virtual Ice::ConnectionInfoPtr getInfo() const;
-    virtual void checkSendSize(const Buffer&);
-    virtual void setBufferSize(int rcvSize, int sndSize);
-
-private:
-
-    WSTransceiver(const ProtocolInstancePtr&, const TransceiverPtr&, const std::string&, const std::string&);
-    WSTransceiver(const ProtocolInstancePtr&, const TransceiverPtr&);
-    virtual ~WSTransceiver();
-
-    void handleRequest(Buffer&);
-    void handleResponse();
-
-    bool preRead(Buffer&);
-    bool postRead(Buffer&);
-
-    bool preWrite(Buffer&);
-    bool postWrite(Buffer&);
-
-    bool readBuffered(Buffer::Container::size_type);
-    void prepareWriteHeader(Ice::Byte, Buffer::Container::size_type);
-
-    friend class WSConnector;
-    friend class WSAcceptor;
-
-    const ProtocolInstancePtr _instance;
-    const TransceiverPtr _delegate;
-    const std::string _host;
-    const std::string _resource;
-    const bool _incoming;
-
-    enum State
-    {
-        StateInitializeDelegate,
-        StateConnected,
-        StateUpgradeRequestPending,
-        StateUpgradeResponsePending,
-        StateOpened,
-        StatePingPending,
-        StatePongPending,
-        StateClosingRequestPending,
-        StateClosingResponsePending,
-        StateClosed
+        [[nodiscard]] std::string protocol() const final;
+        [[nodiscard]] std::string toString() const final;
+        [[nodiscard]] std::string toDetailedString() const final;
+        [[nodiscard]] Ice::ConnectionInfoPtr
+        getInfo(bool incoming, std::string adapterName, std::string connectionId) const final;
+        void checkSendSize(const Buffer&) final;
+        void setBufferSize(int rcvSize, int sndSize) final;
+
+    private:
+        void handleRequest(Buffer&);
+        void handleResponse();
+
+        bool preRead(Buffer&);
+        bool postRead(Buffer&);
+
+        bool preWrite(Buffer&);
+        bool postWrite(Buffer&);
+
+        bool readBuffered(Buffer::Container::size_type);
+        void prepareWriteHeader(std::uint8_t, Buffer::Container::size_type);
+
+        friend class WSConnector;
+        friend class WSAcceptor;
+
+        const ProtocolInstancePtr _instance;
+        const TransceiverPtr _delegate;
+        const std::string _host;
+        const std::string _resource;
+        const bool _incoming;
+
+        enum State
+        {
+            StateInitializeDelegate,
+            StateConnected,
+            StateUpgradeRequestPending,
+            StateUpgradeResponsePending,
+            StateOpened,
+            StatePingPending,
+            StatePongPending,
+            StateClosingRequestPending,
+            StateClosingResponsePending,
+            StateClosed
+        };
+
+        State _state;
+        State _nextState;
+
+        HttpParserPtr _parser;
+        std::string _key;
+
+        enum ReadState
+        {
+            ReadStateOpcode,
+            ReadStateHeader,
+            ReadStateControlFrame,
+            ReadStatePayload,
+        };
+
+        ReadState _readState;
+        Buffer _readBuffer;
+        Buffer::Container::iterator _readI;
+        const Buffer::Container::size_type _readBufferSize;
+
+        bool _readLastFrame;
+        int _readOpCode;
+        size_t _readHeaderLength;
+        size_t _readPayloadLength;
+        Buffer::Container::iterator _readStart;
+        Buffer::Container::iterator _readFrameStart;
+        std::byte _readMask[4];
+
+        enum WriteState
+        {
+            WriteStateHeader,
+            WriteStatePayload,
+            WriteStateControlFrame,
+        };
+
+        WriteState _writeState;
+        Buffer _writeBuffer;
+        const Buffer::Container::size_type _writeBufferSize;
+        std::byte _writeMask[4];
+        size_t _writePayloadLength;
+
+        bool _readPending;
+        bool _writePending;
+
+        bool _closingInitiator;
+        int _closingReason;
+
+        std::vector<std::uint8_t> _pingPayload;
     };
-
-    State _state;
-    State _nextState;
-
-    HttpParserPtr _parser;
-    std::string _key;
-
-    enum ReadState
-    {
-        ReadStateOpcode,
-        ReadStateHeader,
-        ReadStateControlFrame,
-        ReadStatePayload,
-    };
-
-    ReadState _readState;
-    Buffer _readBuffer;
-    Buffer::Container::iterator _readI;
-    const Buffer::Container::size_type _readBufferSize;
-
-    bool _readLastFrame;
-    int _readOpCode;
-    size_t _readHeaderLength;
-    size_t _readPayloadLength;
-    Buffer::Container::iterator _readStart;
-    Buffer::Container::iterator _readFrameStart;
-    unsigned char _readMask[4];
-
-    enum WriteState
-    {
-        WriteStateHeader,
-        WriteStatePayload,
-        WriteStateControlFrame,
-    };
-
-    WriteState _writeState;
-    Buffer _writeBuffer;
-    const Buffer::Container::size_type _writeBufferSize;
-    unsigned char _writeMask[4];
-    size_t _writePayloadLength;
-
-    bool _readPending;
-    bool _writePending;
-
-    bool _closingInitiator;
-    int _closingReason;
-
-    std::vector<Ice::Byte> _pingPayload;
-};
-
 }
 
 #endif

data/dist/ice/cpp/src/Ice/generated/BuiltinSequences.cpp

@@ -1,49 +1,40 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.11
-//
-// <auto-generated>
-//
-// Generated from file `BuiltinSequences.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
+// Copyright (c) ZeroC, Inc.
+
+// slice2cpp version 3.8.1
+// <auto-generated>Generated from Slice file 'BuiltinSequences.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
 #   define ICE_API_EXPORTS
 #endif
-#include <Ice/BuiltinSequences.h>
-#include <IceUtil/PushDisableWarnings.h>
-#include <Ice/InputStream.h>
-#include <Ice/OutputStream.h>
-#include <IceUtil/PopDisableWarnings.h>
+#define ICE_BUILDING_GENERATED_CODE
+
+#include "Ice/BuiltinSequences.h"
+#include <Ice/Ice.h>
+#include <Ice/AsyncResponseHandler.h>
+#include <Ice/DefaultSliceLoader.h>
+#include <Ice/OutgoingAsync.h>
+#include <algorithm>
+#include <array>
 
 #if defined(_MSC_VER)
-#   pragma warning(disable:4458) // declaration of ... hides class member
+#   pragma warning(disable : 4458) // declaration of ... hides class member
+#   pragma warning(disable : 4996) // ... was declared deprecated
 #elif defined(__clang__)
 #   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #elif defined(__GNUC__)
 #   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
+#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
-
-#ifdef ICE_CPP11_MAPPING // C++11 mapping
-
-#else // C++98 mapping
-
-#endif

data/dist/ice/cpp/src/Ice/generated/Context.cpp

@@ -0,0 +1,40 @@
+// Copyright (c) ZeroC, Inc.
+
+// slice2cpp version 3.8.1
+// <auto-generated>Generated from Slice file 'Context.ice'.</auto-generated>
+
+#ifndef ICE_API_EXPORTS
+#   define ICE_API_EXPORTS
+#endif
+#define ICE_BUILDING_GENERATED_CODE
+
+#include "Ice/Context.h"
+#include <Ice/Ice.h>
+#include <Ice/AsyncResponseHandler.h>
+#include <Ice/DefaultSliceLoader.h>
+#include <Ice/OutgoingAsync.h>
+#include <algorithm>
+#include <array>
+
+#if defined(_MSC_VER)
+#   pragma warning(disable : 4458) // declaration of ... hides class member
+#   pragma warning(disable : 4996) // ... was declared deprecated
+#elif defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#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 < 1
+#       error Ice patch level mismatch!
+#   endif
+#endif

data/dist/ice/cpp/src/Ice/generated/EndpointTypes.cpp

@@ -1,51 +1,40 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.11
-//
-// <auto-generated>
-//
-// Generated from file `EndpointTypes.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
+// Copyright (c) ZeroC, Inc.
+
+// slice2cpp version 3.8.1
+// <auto-generated>Generated from Slice file 'EndpointTypes.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
 #   define ICE_API_EXPORTS
 #endif
-#include <Ice/EndpointTypes.h>
-#include <IceUtil/PushDisableWarnings.h>
-#include <IceUtil/PopDisableWarnings.h>
+#define ICE_BUILDING_GENERATED_CODE
+
+#include "Ice/EndpointTypes.h"
+#include <Ice/Ice.h>
+#include <Ice/AsyncResponseHandler.h>
+#include <Ice/DefaultSliceLoader.h>
+#include <Ice/OutgoingAsync.h>
+#include <algorithm>
+#include <array>
 
 #if defined(_MSC_VER)
-#   pragma warning(disable:4458) // declaration of ... hides class member
+#   pragma warning(disable : 4458) // declaration of ... hides class member
+#   pragma warning(disable : 4996) // ... was declared deprecated
 #elif defined(__clang__)
 #   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #elif defined(__GNUC__)
 #   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
+#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
-
-#ifdef ICE_CPP11_MAPPING // C++11 mapping
-
-#else // C++98 mapping
-
-namespace Ice
-{
-}
-
-#endif

data/dist/ice/cpp/src/Ice/generated/Identity.cpp

@@ -1,57 +1,47 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.11
-//
-// <auto-generated>
-//
-// Generated from file `Identity.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
+// Copyright (c) ZeroC, Inc.
+
+// slice2cpp version 3.8.1
+// <auto-generated>Generated from Slice file 'Identity.ice'.</auto-generated>
 
 #ifndef ICE_API_EXPORTS
 #   define ICE_API_EXPORTS
 #endif
-#include <Ice/Identity.h>
-#include <IceUtil/PushDisableWarnings.h>
-#include <Ice/InputStream.h>
-#include <Ice/OutputStream.h>
-#include <IceUtil/PopDisableWarnings.h>
+#define ICE_BUILDING_GENERATED_CODE
+
+#include "Ice/Identity.h"
+#include <Ice/Ice.h>
+#include <Ice/AsyncResponseHandler.h>
+#include <Ice/DefaultSliceLoader.h>
+#include <Ice/OutgoingAsync.h>
+#include <algorithm>
+#include <array>
 
 #if defined(_MSC_VER)
-#   pragma warning(disable:4458) // declaration of ... hides class member
+#   pragma warning(disable : 4458) // declaration of ... hides class member
+#   pragma warning(disable : 4996) // ... was declared deprecated
 #elif defined(__clang__)
 #   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #elif defined(__GNUC__)
 #   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
+#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
 
-#ifdef ICE_CPP11_MAPPING // C++11 mapping
-
-namespace Ice
+void
+Ice::Identity::ice_printFields(std::ostream& os) const
 {
+    Ice::print(os << "name = ", this->name);
+    Ice::print(os << ", category = ", this->category);
 }
-
-#else // C++98 mapping
-
-namespace Ice
-{
-}
-
-#endif