zeroc-ice 3.7.9.1 → 3.8.0

data/ext/ice/cpp/src/Ice/NetworkProxy.h

@@ -1,72 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_NETWORK_PROXY_H
-#define ICE_NETWORK_PROXY_H
-
-#include <Ice/Network.h>
-#include <Ice/Buffer.h>
-
-namespace IceInternal
-{
-
-class ICE_API NetworkProxy : public virtual IceUtil::Shared
-{
-public:
-
-    virtual ~NetworkProxy();
-
-    //
-    // Write the connection request on the connection established
-    // with the network proxy server. This is called right after
-    // the connection establishment succeeds.
-    //
-    virtual void beginWrite(const Address&, Buffer&) = 0;
-    virtual SocketOperation endWrite(Buffer&) = 0;
-
-    //
-    // Once the connection request has been sent, this is called
-    // to prepare and read the response from the proxy server.
-    //
-    virtual void beginRead(Buffer&) = 0;
-    virtual SocketOperation endRead(Buffer&) = 0;
-
-    //
-    // This is called when the response from the proxy has been
-    // read. The proxy should copy the extra read data (if any) in the
-    // given byte vector.
-    //
-    virtual void finish(Buffer&, Buffer&) = 0;
-
-    //
-    // If the proxy host needs to be resolved, this should return
-    // a new NetworkProxy containing the IP address of the proxy.
-    // This is called from the endpoint host resolver thread, so
-    // it's safe if this this method blocks.
-    //
-    virtual NetworkProxyPtr resolveHost(ProtocolSupport) const = 0;
-
-    //
-    // Returns the IP address of the network proxy. This method
-    // must not block. It's only called on a network proxy object
-    // returned by resolveHost().
-    //
-    virtual Address getAddress() const = 0;
-
-    //
-    // Returns the name of the proxy, used for tracing purposes.
-    //
-    virtual std::string getName() const = 0;
-
-    //
-    // Returns the protocols supported by the proxy.
-    //
-    virtual ProtocolSupport getProtocolSupport() const = 0;
-};
-
-NetworkProxyPtr createNetworkProxy(const Ice::PropertiesPtr&, ProtocolSupport);
-
-}
-
-#endif

data/ext/ice/cpp/src/Ice/NetworkProxyF.h

@@ -1,21 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_NETWORK_PROXY_F_H
-#define ICE_NETWORK_PROXY_F_H
-
-#include <IceUtil/Shared.h>
-
-#include <Ice/Handle.h>
-
-namespace IceInternal
-{
-
-class NetworkProxy;
-ICE_API IceUtil::Shared* upCast(NetworkProxy*);
-typedef Handle<NetworkProxy> NetworkProxyPtr;
-
-}
-
-#endif

data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp

@@ -1,57 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifdef ICE_SWIFT
-
-#include <Ice/OSLogLoggerI.h>
-#include <os/log.h>
-
-using namespace std;
-using namespace Ice;
-
-Ice::OSLogLoggerI::OSLogLoggerI(const std::string& prefix) : _prefix(prefix)
-{
-    const string subsystem = prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + prefix;
-    _log.reset(os_log_create(subsystem.c_str(), ""));
-}
-
-void
-Ice::OSLogLoggerI::print(const std::string& message)
-{
-    os_log_with_type(_log.get(), OS_LOG_TYPE_DEFAULT, "%{public}s.", message.c_str());
-}
-
-void
-Ice::OSLogLoggerI::trace(const std::string& category, const std::string& message)
-{
-    const string subsystem = _prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + _prefix;
-    IceInternal::UniqueRef<os_log_t> log(os_log_create(subsystem.c_str(), category.c_str()));
-    os_log_with_type(log.get(), OS_LOG_TYPE_INFO, "%{public}s.", message.c_str());
-}
-
-void
-Ice::OSLogLoggerI::warning(const std::string& message)
-{
-    os_log_with_type(_log.get(), OS_LOG_TYPE_ERROR, "%{public}s.", message.c_str());
-}
-
-void
-Ice::OSLogLoggerI::error(const std::string& message)
-{
-    os_log_with_type(_log.get(), OS_LOG_TYPE_FAULT, "%{public}s.", message.c_str());
-}
-
-std::string
-Ice::OSLogLoggerI::getPrefix()
-{
-    return _prefix;
-}
-
-LoggerPtr
-Ice::OSLogLoggerI::cloneWithPrefix(const std::string& prefix)
-{
-    return ICE_MAKE_SHARED(OSLogLoggerI, prefix);
-}
-
-#endif

data/ext/ice/cpp/src/Ice/OSLogLoggerI.h

@@ -1,40 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_OSLOG_LOGGER_I_H
-#define ICE_OSLOG_LOGGER_I_H
-
-#ifdef ICE_SWIFT
-
-#include <Ice/Logger.h>
-#include <Ice/UniqueRef.h>
-#include <os/log.h>
-
-namespace Ice
-{
-
-class OSLogLoggerI : public Logger
-{
-public:
-
-    OSLogLoggerI(const std::string&);
-
-    virtual void print(const std::string&);
-    virtual void trace(const std::string&, const std::string&);
-    virtual void warning(const std::string&);
-    virtual void error(const std::string&);
-    virtual std::string getPrefix();
-    virtual LoggerPtr cloneWithPrefix(const std::string&);
-
-private:
-
-    const std::string _prefix;
-    IceInternal::UniqueRef<os_log_t> _log;
-};
-
-}
-
-#endif
-
-#endif

data/ext/ice/cpp/src/Ice/Object.cpp

@@ -1,435 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/Object.h>
-#include <Ice/Incoming.h>
-#include <Ice/IncomingAsync.h>
-#include <Ice/IncomingRequest.h>
-#include <Ice/LocalException.h>
-#include <Ice/SlicedData.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-namespace Ice
-{
-const Current emptyCurrent = Current();
-}
-
-#ifndef ICE_CPP11_MAPPING
-Object* Ice::upCast(Object* p) { return p; }
-
-void
-Ice::_icePatchObjectPtr(ObjectPtr& obj, const ObjectPtr& v)
-{
-    obj = v;
-}
-
-bool
-Ice::Object::operator==(const Object& r) const
-{
-    return this == &r;
-}
-
-bool
-Ice::Object::operator<(const Object& r) const
-{
-    return this < &r;
-}
-#endif
-
-namespace
-{
-
-const string object_ids[] =
-{
-    "::Ice::Object"
-};
-
-const string object_all[] =
-{
-    "ice_id",
-    "ice_ids",
-    "ice_isA",
-    "ice_ping"
-};
-
-}
-
-#ifndef ICE_CPP11_MAPPING
-Ice::DispatchInterceptorAsyncCallback::~DispatchInterceptorAsyncCallback()
-{
-    // Out of line to avoid weak vtable
-}
-#endif
-
-Ice::Request::~Request()
-{
-    // Out of line to avoid weak vtable
-}
-
-bool
-#ifdef ICE_CPP11_MAPPING
-Ice::Object::ice_isA(string s, const Current&) const
-#else
-Ice::Object::ice_isA(const string& s, const Current&) const
-#endif
-{
-    return s == object_ids[0];
-}
-
-void
-Ice::Object::ice_ping(const Current&) const
-{
-    // Nothing to do.
-}
-
-vector<string>
-Ice::Object::ice_ids(const Current&) const
-{
-    return vector<string>(&object_ids[0], &object_ids[1]);
-}
-
-#ifdef ICE_CPP11_MAPPING
-string
-#else
-const string&
-#endif
-Ice::Object::ice_id(const Current&) const
-{
-    return object_ids[0];
-}
-
-const ::std::string&
-Ice::Object::ice_staticId()
-{
-    return object_ids[0];
-}
-
-#ifndef ICE_CPP11_MAPPING
-Ice::ObjectPtr
-Ice::Object::ice_clone() const
-{
-    throw CloneNotImplementedException(__FILE__, __LINE__);
-}
-
-Ice::SlicedDataPtr
-Ice::Object::ice_getSlicedData() const
-{
-    return 0;
-}
-#endif
-
-bool
-Ice::Object::_iceD_ice_isA(Incoming& inS, const Current& current)
-{
-    InputStream* istr = inS.startReadParams();
-    string iceP_id;
-    istr->read(iceP_id, false);
-    inS.endReadParams();
-#ifdef ICE_CPP11_MAPPING
-    bool ret = ice_isA(std::move(iceP_id), current);
-#else
-    bool ret = ice_isA(iceP_id, current);
-#endif
-    OutputStream* ostr = inS.startWriteParams();
-    ostr->write(ret);
-    inS.endWriteParams();
-    return true;
-}
-
-bool
-Ice::Object::_iceD_ice_ping(Incoming& inS, const Current& current)
-{
-    inS.readEmptyParams();
-    ice_ping(current);
-    inS.writeEmptyParams();
-    return true;
-}
-
-bool
-Ice::Object::_iceD_ice_ids(Incoming& inS, const Current& current)
-{
-    inS.readEmptyParams();
-    vector<string> ret = ice_ids(current);
-    OutputStream* ostr = inS.startWriteParams();
-    if(ret.empty())
-    {
-        ostr->write(ret);
-    }
-    else
-    {
-        ostr->write(&ret[0], &ret[0] + ret.size(), false);
-    }
-    inS.endWriteParams();
-    return true;
-}
-
-bool
-Ice::Object::_iceD_ice_id(Incoming& inS, const Current& current)
-{
-    inS.readEmptyParams();
-    string ret = ice_id(current);
-    OutputStream* ostr = inS.startWriteParams();
-    ostr->write(ret, false);
-    inS.endWriteParams();
-    return true;
-}
-
-bool
-#ifdef ICE_CPP11_MAPPING
-Ice::Object::ice_dispatch(Request& request, std::function<bool()> r, std::function<bool(std::exception_ptr)> e)
-#else
-Ice::Object::ice_dispatch(Request& request, const DispatchInterceptorAsyncCallbackPtr& cb)
-#endif
-{
-    IceInternal::Incoming& in = dynamic_cast<IceInternal::IncomingRequest&>(request)._in;
-    in.startOver();
-#ifdef ICE_CPP11_MAPPING
-    if(r || e)
-    {
-        in.push(r, e);
-#else
-    if(cb)
-    {
-        in.push(cb);
-#endif
-        try
-        {
-            bool sync = _iceDispatch(in, in.getCurrent());
-            in.pop();
-            return sync;
-        }
-        catch(...)
-        {
-            in.pop();
-            throw;
-        }
-    }
-    else
-    {
-        return _iceDispatch(in, in.getCurrent());
-    }
-}
-
-bool
-Ice::Object::_iceDispatch(Incoming& in, const Current& current)
-{
-    pair<const string*, const string*> r = equal_range(object_all, object_all + sizeof(object_all) / sizeof(string), current.operation);
-
-    if(r.first == r.second)
-    {
-        throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-    }
-
-    switch(r.first - object_all)
-    {
-        case 0:
-        {
-            return _iceD_ice_id(in, current);
-        }
-        case 1:
-        {
-            return _iceD_ice_ids(in, current);
-        }
-        case 2:
-        {
-            return _iceD_ice_isA(in, current);
-        }
-        case 3:
-        {
-            return _iceD_ice_ping(in, current);
-        }
-        default:
-        {
-            assert(false);
-            throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
-        }
-    }
-}
-
-#ifndef ICE_CPP11_MAPPING
-void
-Ice::Object::ice_collectable(bool)
-{
-}
-
-void
-Ice::Object::ice_preMarshal()
-{
-}
-
-void
-Ice::Object::ice_postUnmarshal()
-{
-}
-
-void
-Ice::Object::_iceWrite(Ice::OutputStream* os) const
-{
-    os->startValue(0);
-    _iceWriteImpl(os);
-    os->endValue();
-}
-
-void
-Ice::Object::_iceRead(Ice::InputStream* is)
-{
-   is->startValue();
-   _iceReadImpl(is);
-   is->endValue(false);
-}
-
-Ice::Int
-Ice::Object::ice_operationAttributes(const string&) const
-{
-    return 0;
-}
-#endif
-
-namespace
-{
-
-string
-operationModeToString(OperationMode mode)
-{
-    switch(mode)
-    {
-    case ICE_ENUM(OperationMode, Normal):
-        return "::Ice::Normal";
-
-    case ICE_ENUM(OperationMode, Nonmutating):
-        return "::Ice::Nonmutating";
-
-    case ICE_ENUM(OperationMode, Idempotent):
-        return "::Ice::Idempotent";
-    }
-    //
-    // This could not happen with C++11 strong type enums
-    //
-#ifdef ICE_CPP11_MAPPING
-    assert(false);
-    return "";
-#else
-    ostringstream os;
-    os << "unknown value (" << mode << ")";
-    return os.str();
-#endif
-}
-
-}
-
-void
-Ice::Object::_iceCheckMode(OperationMode expected, OperationMode received)
-{
-    if(expected != received)
-    {
-        assert(expected != ICE_ENUM(OperationMode, Nonmutating)); // We never expect Nonmutating
-        if(expected == ICE_ENUM(OperationMode, Idempotent) && received == ICE_ENUM(OperationMode, Nonmutating))
-        {
-            //
-            // Fine: typically an old client still using the deprecated nonmutating keyword
-            //
-        }
-        else
-        {
-            std::ostringstream reason;
-            reason << "unexpected operation mode. expected = "
-                   << operationModeToString(expected)
-                   << " received = "
-                   << operationModeToString(received);
-            throw Ice::MarshalException(__FILE__, __LINE__, reason.str());
-        }
-    }
-}
-
-bool
-Ice::Blobject::_iceDispatch(Incoming& in, const Current& current)
-{
-    const Byte* inEncaps;
-    Int sz;
-    in.readParamEncaps(inEncaps, sz);
-    vector<Byte> outEncaps;
-    bool ok = ice_invoke(vector<Byte>(inEncaps, inEncaps + sz), outEncaps, current);
-    if(outEncaps.empty())
-    {
-        in.writeParamEncaps(0, 0, ok);
-    }
-    else
-    {
-        in.writeParamEncaps(&outEncaps[0], static_cast<Ice::Int>(outEncaps.size()), ok);
-    }
-    return true;
-}
-
-bool
-Ice::BlobjectArray::_iceDispatch(Incoming& in, const Current& current)
-{
-    pair<const Byte*, const Byte*> inEncaps;
-    Int sz;
-    in.readParamEncaps(inEncaps.first, sz);
-    inEncaps.second = inEncaps.first + sz;
-    vector<Byte> outEncaps;
-    bool ok = ice_invoke(inEncaps, outEncaps, current);
-    if(outEncaps.empty())
-    {
-        in.writeParamEncaps(0, 0, ok);
-    }
-    else
-    {
-        in.writeParamEncaps(&outEncaps[0], static_cast<Ice::Int>(outEncaps.size()), ok);
-    }
-    return true;
-}
-
-bool
-Ice::BlobjectAsync::_iceDispatch(Incoming& in, const Current& current)
-{
-    const Byte* inEncaps;
-    Int sz;
-    in.readParamEncaps(inEncaps, sz);
-#ifdef ICE_CPP11_MAPPING
-    auto async = IncomingAsync::create(in);
-    ice_invokeAsync(vector<Byte>(inEncaps, inEncaps + sz),
-                    [async](bool ok, const vector<Byte>& outEncaps)
-                    {
-                        if(outEncaps.empty())
-                        {
-                            async->writeParamEncaps(0, 0, ok);
-                        }
-                        else
-                        {
-                            async->writeParamEncaps(&outEncaps[0], static_cast<Int>(outEncaps.size()), ok);
-                        }
-                        async->completed();
-                    },
-                    async->exception(), current);
-#else
-    ice_invoke_async(new ::IceAsync::Ice::AMD_Object_ice_invoke(in), vector<Byte>(inEncaps, inEncaps + sz), current);
-#endif
-    return false;
-}
-
-bool
-Ice::BlobjectArrayAsync::_iceDispatch(Incoming& in, const Current& current)
-{
-    pair<const Byte*, const Byte*> inEncaps;
-    Int sz;
-    in.readParamEncaps(inEncaps.first, sz);
-    inEncaps.second = inEncaps.first + sz;
-#ifdef ICE_CPP11_MAPPING
-    auto async = IncomingAsync::create(in);
-    ice_invokeAsync(inEncaps,
-                    [async](bool ok, const pair<const Byte*, const Byte*>& outE)
-                    {
-                        async->writeParamEncaps(outE.first, static_cast<Int>(outE.second - outE.first), ok);
-                        async->completed();
-                    },
-                    async->exception(), current);
-#else
-    ice_invoke_async(new ::IceAsync::Ice::AMD_Object_ice_invoke(in), inEncaps, current);
-#endif
-    return false;
-}

data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp

@@ -1,79 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.9
-//
-// <auto-generated>
-//
-// Generated from file `ObjectAdapter.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
-
-#ifndef ICE_API_EXPORTS
-#   define ICE_API_EXPORTS
-#endif
-#include <Ice/ObjectAdapter.h>
-#include <IceUtil/PushDisableWarnings.h>
-#include <Ice/LocalException.h>
-#include <Ice/ValueFactory.h>
-#include <Ice/OutgoingAsync.h>
-#include <Ice/InputStream.h>
-#include <Ice/OutputStream.h>
-#include <Ice/LocalException.h>
-#include <IceUtil/PopDisableWarnings.h>
-
-#if defined(_MSC_VER)
-#   pragma warning(disable:4458) // declaration of ... hides class member
-#elif defined(__clang__)
-#   pragma clang diagnostic ignored "-Wshadow"
-#elif defined(__GNUC__)
-#   pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
-#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 < 9
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
-#ifdef ICE_CPP11_MAPPING // C++11 mapping
-
-namespace
-{
-
-}
-
-Ice::ObjectAdapter::~ObjectAdapter()
-{
-}
-
-#else // C++98 mapping
-
-namespace
-{
-
-}
-
-Ice::ObjectAdapter::~ObjectAdapter()
-{
-}
-
-/// \cond INTERNAL
-ICE_API ::Ice::LocalObject* Ice::upCast(ObjectAdapter* p) { return p; }
-/// \endcond
-
-namespace Ice
-{
-}
-
-#endif