zeroc-ice 3.6.5 → 3.7.4

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_METRICSFUNCTIONAL_H
 #define ICE_METRICSFUNCTIONAL_H
@@ -21,6 +16,23 @@ template struct ReferenceWrapper
     }
 };
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+template<typename R> struct ReferenceWrapper<::std::shared_ptr<R> >
+{
+    static R* get(const ::std::shared_ptr<R>& v)
+    {
+        return v.get();
+    }
+};
+
+template<typename R> struct ReferenceWrapper<const ::std::shared_ptr<R>& >
+{
+    static R* get(const ::std::shared_ptr<R>& v)
+    {
+        return v.get();
+    }
+};
+#else // C++98 mapping
 template<typename R> struct ReferenceWrapper<IceInternal::ProxyHandle<R> >
 {
     static R* get(const IceInternal::ProxyHandle<R>& v)
@@ -36,7 +48,7 @@ template struct ReferenceWrapper&
         return v.get();
     }
 };
-    
+
 template<typename R> struct ReferenceWrapper<IceInternal::Handle<R> >
 {
     static R* get(const IceInternal::Handle<R>& v)
@@ -52,7 +64,8 @@ template struct ReferenceWrapper& >
         return v.get();
     }
 };
-    
+#endif
+
 template<typename R> struct ReferenceWrapper<R*>
 {
     static R* get(R* v)
@@ -74,9 +87,10 @@ template struct ReferenceWrapper
 namespace IceMX
 {
 
+/// \cond INTERNAL
 template<class T, typename Y, typename Func> struct ApplyOnMember
 {
-    ApplyOnMember(Y T::*member, Func func) : func(func), member(member)
+    ApplyOnMember(Y T::*m, Func f) : func(f), member(m)
     {
     }
 
@@ -108,7 +122,7 @@ template struct Increment
 
 template<typename T> struct Add
 {
-    Add(T value) : value(value) { }
+    Add(T v) : value(v) { }
 
     template<typename Y>
     void operator()(Y& v)
@@ -138,6 +152,7 @@ template ApplyOnMember > dec(Y T::*membe
 {
     return applyOnMember(member, Decrement<Y>());
 }
+/// \endcond
 
 }
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 ICEMX_METRICSOBSERVER_I_H
 #define ICEMX_METRICSOBSERVER_I_H
@@ -26,6 +21,7 @@
 namespace IceMX
 {
 
+/// \cond INTERNAL
 template<typename T> class MetricsHelperT
 {
 public:
@@ -36,7 +32,7 @@ public:
 
     virtual std::string operator()(const std::string&) const = 0;
 
-    virtual void initMetrics(const IceInternal::Handle<T>&) const
+    virtual void initMetrics(const ICE_INTERNAL_HANDLE<T>&) const
     {
         // To be overriden in specialization to initialize state attributes
     }
@@ -131,6 +127,20 @@ protected:
                                                                                                 memberFn)));
         }
 
+#if ICE_CPLUSPLUS >= 201703L
+        //
+        // Since C++17 the noexcept-specification is part of the function type and we need a separate
+        // overload to handle memberFn being noexcept
+        //
+        template<typename I, typename O, typename Y> void
+        add(const std::string& name, O (Helper::*getFn)() const, Y (I::*memberFn)() const noexcept)
+        {
+            _attributes.insert(typename std::map<std::string,
+                               Resolver*>::value_type(name, new MemberFunctionResolver<I, O, Y>(name, getFn,
+                                                                                                memberFn)));
+        }
+#endif
+
     private:
 
         template<typename Y> class HelperMemberResolver : public Resolver
@@ -170,7 +180,6 @@ protected:
             Y (Helper::*_memberFn)() const;
         };
 
-
         template<typename I, typename O, typename Y> class MemberResolver : public Resolver
         {
         public:
@@ -183,7 +192,7 @@ protected:
             virtual std::string operator()(const Helper* r) const
             {
                 O o = (r->*_getFn)();
-                I* v = dynamic_cast<I*>(IceInternal::ReferenceWrapper<O>::get(o));
+                I* v = dynamicCast<I>(IceInternal::ReferenceWrapper<O>::get(o));
                 if(v)
                 {
                     return toString(v->*_member);
@@ -212,7 +221,7 @@ protected:
             virtual std::string operator()(const Helper* r) const
             {
                 O o = (r->*_getFn)();
-                I* v = dynamic_cast<I*>(IceInternal::ReferenceWrapper<O>::get(o));
+                I* v = dynamicCast<I>(IceInternal::ReferenceWrapper<O>::get(o));
                 if(v)
                 {
                     return toString((v->*_memberFn)());
@@ -229,6 +238,40 @@ protected:
             Y (I::*_memberFn)() const;
         };
 
+        template<typename I, typename V> static I*
+        dynamicCast(V* v)
+        {
+            return dynamic_cast<I*>(v);
+        }
+
+        template<typename I> static I*
+        dynamicCast(Ice::EndpointInfo* v)
+        {
+            for(Ice::EndpointInfo* info = v; info; info = info->underlying.get())
+            {
+                I* i = dynamic_cast<I*>(info);
+                if(i)
+                {
+                    return i;
+                }
+            }
+            return 0;
+        }
+
+        template<typename I> static I*
+        dynamicCast(Ice::ConnectionInfo* v)
+        {
+            for(Ice::ConnectionInfo* info = v; info; info = info->underlying.get())
+            {
+                I* i = dynamic_cast<I*>(info);
+                if(i)
+                {
+                    return i;
+                }
+            }
+            return 0;
+        }
+
         template<typename I> static std::string
         toString(const I& v)
         {
@@ -237,6 +280,12 @@ protected:
             return os.str();
         }
 
+        static const std::string
+        toString(const Ice::ObjectPrxPtr& p)
+        {
+            return p->ice_toString();
+        }
+
         static const std::string&
         toString(const std::string& s)
         {
@@ -266,20 +315,28 @@ protected:
     };
 };
 
-class Updater : public IceUtil::Shared
+class Updater
+#ifndef ICE_CPP11_MAPPING
+    : public virtual IceUtil::Shared
+#endif
 {
 public:
 
     virtual void update() = 0;
 };
-typedef IceUtil::Handle<Updater> UpdaterPtr;
+ICE_DEFINE_PTR(UpdaterPtr, Updater);
 
-template<typename T> class UpdaterT : public Updater
+template<typename T> class UpdaterT ICE_FINAL : public Updater
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    UpdaterT(const std::shared_ptr<T>& updater, void (T::*fn)()) :
+#else
     UpdaterT(T* updater, void (T::*fn)()) :
-        _updater(updater), _fn(fn)
+#endif
+        _updater(updater),
+        _fn(fn)
     {
     }
 
@@ -290,24 +347,39 @@ public:
 
 private:
 
-    const IceUtil::Handle<T> _updater;
+    const ICE_HANDLE<T> _updater;
     void (T::*_fn)();
 };
 
-template<typename T> Updater*
+#ifdef ICE_CPP11_MAPPING
+template<typename T> UpdaterPtr
+newUpdater(const std::shared_ptr<T>& updater, void (T::*fn)())
+{
+    if(updater)
+    {
+        return std::make_shared<UpdaterT<T>>(updater, fn);
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+#else
+template<typename T> UpdaterPtr
 newUpdater(const IceInternal::Handle<T>& updater, void (T::*fn)())
 {
     if(updater)
     {
-        return new UpdaterT<T>(updater.get(), fn);
+        return UpdaterPtr(new UpdaterT<T>(updater.get(), fn));
     }
     else
     {
         return 0;
     }
 }
+#endif
 
-template<typename T> class ObserverT : virtual public ::Ice::Instrumentation::Observer
+template<typename T> class ObserverT : public virtual ::Ice::Instrumentation::Observer
 {
 public:
 
@@ -367,7 +439,6 @@ public:
         }
 
         _previousDelay = previous->_previousDelay + previous->_watch.delay();
-
         //
         // Detach entries from previous observer which are no longer
         // attached to this new observer.
@@ -391,10 +462,10 @@ public:
                 return *p;
             }
         }
-        return 0;
+        return ICE_NULLPTR;
     }
 
-    template<typename ObserverImpl, typename ObserverMetricsType> IceInternal::Handle<ObserverImpl>
+    template<typename ObserverImpl, typename ObserverMetricsType> ICE_INTERNAL_HANDLE<ObserverImpl>
     getObserver(const std::string& mapName, const MetricsHelperT<ObserverMetricsType>& helper)
     {
         std::vector<typename IceInternal::MetricsMapT<ObserverMetricsType>::EntryTPtr> metricsObjects;
@@ -409,10 +480,10 @@ public:
 
         if(metricsObjects.empty())
         {
-            return 0;
+            return ICE_NULLPTR;
         }
 
-        IceInternal::Handle<ObserverImpl> obsv = new ObserverImpl();
+        ICE_INTERNAL_HANDLE<ObserverImpl> obsv = ICE_MAKE_SHARED(ObserverImpl);
         obsv->init(helper, metricsObjects);
         return obsv;
     }
@@ -429,10 +500,15 @@ class ObserverFactoryT : public Updater, private IceUtil::Mutex
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    using ObserverImplPtrType = ::std::shared_ptr<ObserverImplType>;
+    using MetricsType = typename ObserverImplType::MetricsType;
+    using MetricsMapSeqType = std::vector<::std::shared_ptr<IceInternal::MetricsMapT<MetricsType>>>;
+#else
     typedef IceUtil::Handle<ObserverImplType> ObserverImplPtrType;
     typedef typename ObserverImplType::MetricsType MetricsType;
-
     typedef std::vector<IceUtil::Handle<IceInternal::MetricsMapT<MetricsType> > > MetricsMapSeqType;
+#endif
 
     ObserverFactoryT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) :
         _metrics(metrics), _name(name), _enabled(0)
@@ -454,7 +530,7 @@ public:
         IceUtil::Mutex::Lock sync(*this);
         if(!_metrics)
         {
-            return 0;
+            return ICE_NULLPTR;
         }
 
         typename ObserverImplType::EntrySeqType metricsObjects;
@@ -469,10 +545,10 @@ public:
 
         if(metricsObjects.empty())
         {
-            return 0;
+            return ICE_NULLPTR;
         }
 
-        ObserverImplPtrType obsv = new ObserverImplType();
+        ObserverImplPtrType obsv = ICE_MAKE_SHARED(ObserverImplType);
         obsv->init(helper, metricsObjects);
         return obsv;
     }
@@ -480,16 +556,20 @@ public:
     template<typename ObserverPtrType> ObserverImplPtrType
     getObserver(const MetricsHelperT<MetricsType>& helper, const ObserverPtrType& observer)
     {
+#ifdef ICE_CPP11_MAPPING
+        ObserverImplPtrType old = std::dynamic_pointer_cast<ObserverImplType>(observer);
+#else
         ObserverImplPtrType old = ObserverImplPtrType::dynamicCast(observer);
+#endif
+
         if(!observer || !old)
         {
             return getObserver(helper);
         }
-
         IceUtil::Mutex::Lock sync(*this);
         if(!_metrics)
         {
-            return 0;
+            return ICE_NULLPTR;
         }
 
         typename ObserverImplType::EntrySeqType metricsObjects;
@@ -501,14 +581,13 @@ public:
                 metricsObjects.push_back(entry);
             }
         }
-
         if(metricsObjects.empty())
         {
             old->detach();
-            return 0;
+            return ICE_NULLPTR;
         }
 
-        ObserverImplPtrType obsv = new ObserverImplType();
+        ObserverImplPtrType obsv = ICE_MAKE_SHARED(ObserverImplType);
         obsv->init(helper, metricsObjects, old.get());
         return obsv;
     }
@@ -539,7 +618,11 @@ public:
             _maps.clear();
             for(std::vector<IceInternal::MetricsMapIPtr>::const_iterator p = maps.begin(); p != maps.end(); ++p)
             {
+#ifdef ICE_CPP11_MAPPING
+                _maps.push_back(::std::dynamic_pointer_cast<IceInternal::MetricsMapT<MetricsType>>(*p));
+#else
                 _maps.push_back(IceUtil::Handle<IceInternal::MetricsMapT<MetricsType> >::dynamicCast(*p));
+#endif
                 assert(_maps.back());
             }
             _enabled.exchange(_maps.empty() ? 0 : 1);
@@ -579,6 +662,7 @@ private:
 };
 
 typedef ObserverT<Metrics> ObserverI;
+/// \endcond
 
 }
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_PROPERTIES_ADMIN_H
 #define ICE_PROPERTIES_ADMIN_H
@@ -15,40 +10,76 @@
 namespace Ice
 {
 
-//
-// An application can be notified when its configuration properties are modified
-// via the Properties admin facet. The application must define a subclass of
-// PropertiesAdminUpdateCallback and register it with the facet. The facet
-// implements the class NativePropertiesAdmin, so the application needs to
-// downcast the facet to this type in order to register the callback.
-//
-// For example:
-//
-// Ice::ObjectPtr obj = communicator->findAdminFacet("Properties");
-// assert(obj); // May be null if the facet is not enabled
-// NativePropertiesAdminPtr facet = NativePropertiesAdminPtr::dynamicCast(obj);
-// PropertiesAdminUpdateCallbackPtr myCallback = ...;
-// facet->addUpdateCallback(myCallback);
-//
-// Ice ignores any exceptions raised by the callback.
-//
-
-class ICE_API PropertiesAdminUpdateCallback : virtual public Ice::LocalObject
+#ifndef ICE_CPP11_MAPPING
+/**
+ * An application can be notified when its configuration properties are modified
+ * via the Properties admin facet. The application must define a subclass of
+ * PropertiesAdminUpdateCallback and register it with the facet. The facet
+ * implements the class NativePropertiesAdmin, so the application needs to
+ * downcast the facet to this type in order to register the callback.
+ *
+ * For example:
+ *
+ * \code
+ * Ice::ObjectPtr obj = communicator->findAdminFacet("Properties");
+ * assert(obj); // May be null if the facet is not enabled
+ * NativePropertiesAdminPtr facet = NativePropertiesAdminPtr::dynamicCast(obj);
+ * PropertiesAdminUpdateCallbackPtr myCallback = ...;
+ * facet->addUpdateCallback(myCallback);
+ * \endcode
+ *
+ * Ice ignores any exceptions raised by the callback.
+ * \headerfile Ice/Ice.h
+ */
+class ICE_API PropertiesAdminUpdateCallback : public virtual Ice::LocalObject
 {
 public:
 
-    virtual void updated(const PropertyDict&) = 0;
+    virtual ~PropertiesAdminUpdateCallback();
+
+    /**
+     * Called when the communicator's properties have been updated.
+     * @param d A dictionary containing the properties that were added, changed or removed,
+     * with a removed property denoted by an entry whose value is an empty string.
+     */
+    virtual void updated(const PropertyDict& d) = 0;
 };
 typedef IceUtil::Handle<PropertiesAdminUpdateCallback> PropertiesAdminUpdateCallbackPtr;
+#endif
 
-class ICE_API NativePropertiesAdmin : virtual public IceUtil::Shared
+/**
+ * Base class for the Properties admin facet.
+ * \headerfile Ice/Ice.h
+ */
+class ICE_API NativePropertiesAdmin
+#ifndef ICE_CPP11_MAPPING
+    : public virtual IceUtil::Shared
+#endif
 {
 public:
 
-    virtual void addUpdateCallback(const PropertiesAdminUpdateCallbackPtr&) = 0;
-    virtual void removeUpdateCallback(const PropertiesAdminUpdateCallbackPtr&) = 0;
+    virtual ~NativePropertiesAdmin();
+
+#ifdef ICE_CPP11_MAPPING
+    /**
+     * Register an update callback that will be invoked when property updates occur.
+     * @param cb The callback.
+     */
+    virtual std::function<void()> addUpdateCallback(std::function<void(const PropertyDict&)> cb) = 0;
+#else
+    /**
+     * Register an update callback that will be invoked when property updates occur.
+     * @param cb The callback.
+     */
+    virtual void addUpdateCallback(const PropertiesAdminUpdateCallbackPtr& cb) = 0;
+    /**
+     * Remove an update callback.
+     * @param cb The callback to be removed.
+     */
+    virtual void removeUpdateCallback(const PropertiesAdminUpdateCallbackPtr& cb) = 0;
+#endif
 };
-typedef IceUtil::Handle<NativePropertiesAdmin> NativePropertiesAdminPtr;
+ICE_DEFINE_PTR(NativePropertiesAdminPtr, NativePropertiesAdmin);
 
 }