zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/include/Ice/ConnectionIF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// 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.
@@ -17,8 +17,12 @@ namespace Ice
 {
 
 class ConnectionI;
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+using ConnectionIPtr = ::std::shared_ptr<ConnectionI>;
+#else // C++98 mapping
 ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
 typedef IceInternal::Handle<ConnectionI> ConnectionIPtr;
+#endif
 
 }
 

data/ext/ice/cpp/include/Ice/ConsoleUtil.h

@@ -0,0 +1,28 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#ifndef ICE_CONSOLE_UTIL_H
+#define ICE_CONSOLE_UTIL_H
+
+#include <IceUtil/ConsoleUtil.h>
+
+namespace IceInternal
+{
+
+using IceUtilInternal::consoleOut;
+using IceUtilInternal::consoleErr;
+
+#if defined(_WIN32) && !defined(ICE_OS_UWP)
+using IceUtilInternal::endl;
+using IceUtilInternal::flush;
+#endif
+
+}
+
+#endif

data/ext/ice/cpp/include/Ice/{DefaultObjectFactory.h → DefaultValueFactory.h}

@@ -1,26 +1,43 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 
-#ifndef ICE_DEFAULT_OBJECT_FACTORY_H
-#define ICE_DEFAULT_OBJECT_FACTORY_H
+#ifndef ICE_DEFAULT_VALUE_FACTORY_H
+#define ICE_DEFAULT_VALUE_FACTORY_H
 
 #include <Ice/Config.h>
-#include <Ice/ObjectFactory.h>
+#include <Ice/ValueFactory.h>
 
 namespace IceInternal
 {
-template<class O>
-class DefaultObjectFactory : public Ice::ObjectFactory
+
+#ifdef ICE_CPP11_MAPPING
+
+template<class V>
+::std::shared_ptr<::Ice::Value>
+#ifdef NDEBUG
+defaultValueFactory(const std::string&)
+#else
+defaultValueFactory(const std::string& typeId)
+#endif
+{
+    assert(typeId == V::ice_staticId());
+    return std::make_shared<V>();
+}
+
+#else
+
+template<class V>
+class DefaultValueFactory : public Ice::ValueFactory
 {
 public:
-    
-    DefaultObjectFactory(const ::std::string& typeId) :
+
+    DefaultValueFactory(const ::std::string& typeId) :
         _typeId(typeId)
     {
     }
@@ -32,17 +49,14 @@ public:
 #endif
     {
         assert(typeId == _typeId);
-        return new O;
-    }
-
-    virtual void destroy()
-    {
+        return new V;
     }
 
 private:
     const ::std::string _typeId;
 };
 
-}
+#endif
 
+}
 #endif

data/ext/ice/cpp/include/Ice/DispatchInterceptor.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// 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.
@@ -19,14 +19,12 @@ class ICE_API DispatchInterceptor : public virtual Object
 {
 public:
 
-    virtual DispatchStatus
-    dispatch(Request&) = 0;
+    virtual bool dispatch(Request&) = 0;
 
-    virtual DispatchStatus
-    __dispatch(IceInternal::Incoming&, const Current&);
+    virtual bool _iceDispatch(IceInternal::Incoming&, const Current&);
 };
 
-typedef IceInternal::Handle<DispatchInterceptor> DispatchInterceptorPtr;
+ICE_DEFINE_PTR(DispatchInterceptorPtr, DispatchInterceptor);
 
 }
 

data/ext/ice/cpp/include/Ice/Dispatcher.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// 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.
@@ -10,42 +10,43 @@
 #ifndef ICE_DISPATCHER_H
 #define ICE_DISPATCHER_H
 
-#include <IceUtil/Config.h>
+#if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC)
+//
+// Part of the C++98 mapping, and "internal" definitions when building Ice
+// with the C++11 mapping
+//
+
+#include <Ice/Config.h>
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
 #include <Ice/ConnectionF.h>
-#ifdef ICE_CPP11
-#   include <functional>
-#endif
 
 namespace Ice
 {
 
-class ICE_API DispatcherCall : virtual public IceUtil::Shared
+class ICE_API DispatcherCall : public virtual IceUtil::Shared
 {
 public:
 
-    virtual ~DispatcherCall() { }
+    virtual ~DispatcherCall();
 
     virtual void run() = 0;
 };
 
 typedef IceUtil::Handle<DispatcherCall> DispatcherCallPtr;
 
-class ICE_API Dispatcher : virtual public IceUtil::Shared
+class ICE_API Dispatcher : public virtual IceUtil::Shared
 {
 public:
 
+    virtual ~Dispatcher();
+
     virtual void dispatch(const DispatcherCallPtr&, const ConnectionPtr&) = 0;
 };
 
 typedef IceUtil::Handle<Dispatcher> DispatcherPtr;
 
-#ifdef ICE_CPP11
-ICE_API DispatcherPtr
-newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>&);
-#endif
-
 }
 
 #endif
+#endif

data/ext/ice/cpp/include/Ice/DynamicLibrary.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// 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.
@@ -21,7 +21,7 @@ class ICE_API DynamicLibrary : public ::IceUtil::Shared
 public:
 
     DynamicLibrary();
-    ~DynamicLibrary();
+    virtual ~DynamicLibrary();
 
 #ifdef _WIN32
     typedef FARPROC symbol_type;
@@ -40,12 +40,12 @@ public:
     //
     // The name of the library is constructed from the given
     // information. If no version is supplied and the boolean
-    // argument is true, the Ice version (10 * major + minor) is 
+    // argument is true, the Ice version (10 * major + minor) is
     // used instead.
     //
     // For example, consider the following entry point:
-    //  
-    // foo:create 
+    //
+    // foo:create
     //
     // This would result in libfoo.so.11 (Unix) and foo11.dll
     // (Windows), where the Ice version is 1.1.x.
@@ -93,6 +93,8 @@ class ICE_API DynamicLibraryList : public ::IceUtil::Shared
 {
 public:
 
+    virtual ~DynamicLibraryList();
+
     void add(const DynamicLibraryPtr&);
 
 private:

data/ext/ice/cpp/include/Ice/DynamicLibraryF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// 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.

data/ext/ice/cpp/include/Ice/Exception.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// 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.
@@ -15,99 +15,109 @@
 #include <Ice/Format.h>
 #include <Ice/Handle.h>
 #include <Ice/ObjectF.h>
-#include <Ice/StreamF.h>
-
-namespace IceInternal
-{
-
-class BasicStream;
-
-namespace Ex
-{
-
-ICE_API void throwUOE(const ::std::string&, const ::Ice::ObjectPtr&);
-ICE_API void throwMemoryLimitException(const char*, int, size_t, size_t);
-ICE_API void throwMarshalException(const char*, int, const std::string&);
-
-}
-
-}
+#include <Ice/ValueF.h>
+#include <Ice/SlicedDataF.h>
 
 namespace Ice
 {
 
+class OutputStream;
+class InputStream;
+
 typedef IceUtil::Exception Exception;
 
+//
+// Base class for all Ice run-time exceptions
+//
 class ICE_API LocalException : public IceUtil::Exception
 {
 public:
 
     LocalException(const char*, int);
+
+#ifdef ICE_CPP11_COMPILER
+    LocalException(const LocalException&) = default;
+    virtual ~LocalException();
+#else
     virtual ~LocalException() throw();
-    virtual std::string ice_name() const = 0;
+#endif
+
+#ifdef ICE_CPP11_MAPPING
+    std::unique_ptr<LocalException> ice_clone() const;
+#else
     virtual LocalException* ice_clone() const = 0;
-    virtual void ice_throw() const = 0;
+#endif
+
+    static const std::string& ice_staticId();
 };
 
+//
+// Base class for all Ice user exceptions
+//
 class ICE_API UserException : public IceUtil::Exception
 {
 public:
 
-    virtual std::string ice_name() const = 0;
+#ifdef ICE_CPP11_MAPPING
+    std::unique_ptr<UserException> ice_clone() const;
+#else
     virtual UserException* ice_clone() const = 0;
-    virtual void ice_throw() const = 0;
+#endif
+    virtual Ice::SlicedDataPtr ice_getSlicedData() const;
 
-    virtual void __write(::IceInternal::BasicStream*) const;
-    virtual void __read(::IceInternal::BasicStream*);
+    static const std::string& ice_staticId();
 
-    virtual void __write(const OutputStreamPtr&) const;
-    virtual void __read(const InputStreamPtr&);
+    virtual void _write(::Ice::OutputStream*) const;
+    virtual void _read(::Ice::InputStream*);
 
-    virtual bool __usesClasses() const;
+    virtual bool _usesClasses() const;
 
 protected:
 
-    virtual void __writeImpl(::IceInternal::BasicStream*) const = 0;
-    virtual void __readImpl(::IceInternal::BasicStream*) = 0;
-
-    virtual void __writeImpl(const OutputStreamPtr&) const;
-    virtual void __readImpl(const InputStreamPtr&);
+    virtual void _writeImpl(::Ice::OutputStream*) const {}
+    virtual void _readImpl(::Ice::InputStream*) {}
 };
 
-typedef ::IceInternal::Handle<UserException> UserExceptionPtr;
-
+//
+// Base class for all Ice system exceptions
+//
+// System exceptions are currently Ice internal, non-documented
+// exceptions.
+//
 class ICE_API SystemException : public IceUtil::Exception
 {
 public:
 
     SystemException(const char*, int);
+#ifdef ICE_CPP11_COMPILER
+    SystemException(const SystemException&) = default;
+    virtual ~SystemException();
+#else
     virtual ~SystemException() throw();
-    virtual std::string ice_name() const = 0;
+#endif
+
+#ifdef ICE_CPP11_MAPPING
+    std::unique_ptr<SystemException> ice_clone() const;
+#else
     virtual SystemException* ice_clone() const = 0;
-    virtual void ice_throw() const = 0;
+#endif
+
+    static const std::string& ice_staticId();
 };
 
-typedef ::IceInternal::Handle<SystemException> SystemExceptionPtr;
+}
 
-#if defined(__SUNPRO_CC)
-//
-// COMPILERFIX: With Sun CC the presence of the overloaded operator
-// in ProxyHandle.h
-//
-//   template<class OStream, class Y>
-//   OStream& operator<<(OStream& os, ::IceInternal::ProxyHandle<Y> p)
-//
-// prevents the compiler from using the overloaded operator for
-// Exception in IceUtil/Exception.h
-//
-//   std::ostream& operator<<(std::ostream&, const Exception&);
-//
-// thus causing a compile error and making these overloads necessary.
-//
-ICE_API std::ostream& operator<<(std::ostream&, const LocalException&);
-ICE_API std::ostream& operator<<(std::ostream&, const UserException&);
-ICE_API std::ostream& operator<<(std::ostream&, const SystemException&);
-#endif
+namespace IceInternal
+{
+
+namespace Ex
+{
+
+ICE_API void throwUOE(const ::std::string&, const ::Ice::ValuePtr&);
+ICE_API void throwMemoryLimitException(const char*, int, size_t, size_t);
+ICE_API void throwMarshalException(const char*, int, const std::string&);
+
+}
 
 }
 

data/ext/ice/cpp/include/Ice/ExceptionHelpers.h

@@ -0,0 +1,69 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#ifndef ICE_EXCEPTION_HELPERS_H
+#define ICE_EXCEPTION_HELPERS_H
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.h>
+
+namespace Ice
+{
+
+class LocalException;
+
+template<typename T, typename B> class LocalExceptionHelper : public IceUtil::ExceptionHelper<T, B>
+{
+public:
+
+    using IceUtil::ExceptionHelper<T, B>::ExceptionHelper;
+
+    virtual std::string ice_id() const override
+    {
+        return T::ice_staticId();
+    }
+};
+
+template<typename T, typename B> class UserExceptionHelper : public IceUtil::ExceptionHelper<T, B>
+{
+public:
+
+    using IceUtil::ExceptionHelper<T, B>::ExceptionHelper;
+
+    virtual std::string ice_id() const override
+    {
+        return T::ice_staticId();
+    }
+
+protected:
+
+    virtual void _writeImpl(Ice::OutputStream* os) const override
+    {
+        os->startSlice(T::ice_staticId(), -1, std::is_same<B, Ice::LocalException>::value ? true : false);
+        Ice::StreamWriter<T, Ice::OutputStream>::write(os, static_cast<const T&>(*this));
+        os->endSlice();
+        B::_writeImpl(os);
+    }
+
+    virtual void _readImpl(Ice::InputStream* is) override
+    {
+        is->startSlice();
+        Ice::StreamReader<T, ::Ice::InputStream>::read(is, static_cast<T&>(*this));
+        is->endSlice();
+        B::_readImpl(is);
+    }
+};
+
+}
+
+#endif // C++11 mapping end
+
+#endif