zeroc-ice 3.6.5 → 3.7.0

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6.5
+// Ice version 3.7.0
 //
 // <auto-generated>
 //
@@ -23,18 +23,32 @@
 #endif
 #include <Ice/FacetMap.h>
 #include <IceUtil/PushDisableWarnings.h>
-#include <Ice/BasicStream.h>
-#include <IceUtil/Iterator.h>
+#include <Ice/InputStream.h>
+#include <Ice/OutputStream.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 != 306
+#   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 < 5
+#   if ICE_INT_VERSION % 100 < 0
 #       error Ice patch level mismatch!
 #   endif
 #endif
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+#else // C++98 mapping
+
+#endif

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

@@ -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.
@@ -8,14 +8,25 @@
 // **********************************************************************
 
 #include <Ice/FactoryTable.h>
-#include <Ice/ObjectFactory.h>
+#include <Ice/ValueFactory.h>
+
+using namespace std;
+
+#ifndef ICE_CPP11_MAPPING
+
+Ice::UserExceptionFactory::~UserExceptionFactory()
+{
+    // Out of line to avoid weak vtable
+}
+
+#endif
 
 //
 // Add a factory to the exception factory table.
 // If the factory is present already, increment its reference count.
 //
 void
-IceInternal::FactoryTable::addExceptionFactory(const std::string& t, const IceInternal::UserExceptionFactoryPtr& f)
+IceInternal::FactoryTable::addExceptionFactory(const string& t, ICE_IN(ICE_DELEGATE(::Ice::UserExceptionFactory)) f)
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(f);
@@ -33,12 +44,12 @@ IceInternal::FactoryTable::addExceptionFactory(const std::string& t, const IceIn
 //
 // Return the exception factory for a given type ID
 //
-IceInternal::UserExceptionFactoryPtr
-IceInternal::FactoryTable::getExceptionFactory(const std::string& t) const
+ICE_DELEGATE(::Ice::UserExceptionFactory)
+IceInternal::FactoryTable::getExceptionFactory(const string& t) const
 {
     IceUtil::Mutex::Lock lock(_m);
     EFTable::const_iterator i = _eft.find(t);
-    return i != _eft.end() ? i->second.first : IceInternal::UserExceptionFactoryPtr();
+    return i != _eft.end() ? i->second.first : ICE_DELEGATE(::Ice::UserExceptionFactory)();
 }
 
 //
@@ -48,7 +59,7 @@ IceInternal::FactoryTable::getExceptionFactory(const std::string& t) const
 // entry from the table.
 //
 void
-IceInternal::FactoryTable::removeExceptionFactory(const std::string& t)
+IceInternal::FactoryTable::removeExceptionFactory(const string& t)
 {
     IceUtil::Mutex::Lock lock(_m);
     EFTable::iterator i = _eft.find(t);
@@ -62,17 +73,17 @@ IceInternal::FactoryTable::removeExceptionFactory(const std::string& t)
 }
 
 //
-// Add a factory to the object factory table.
+// Add a factory to the value factory table.
 //
 void
-IceInternal::FactoryTable::addObjectFactory(const std::string& t, const Ice::ObjectFactoryPtr& f)
+IceInternal::FactoryTable::addValueFactory(const string& t, ICE_IN(ICE_DELEGATE(::Ice::ValueFactory)) f)
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(f);
-    OFTable::iterator i = _oft.find(t);
-    if(i == _oft.end())
+    VFTable::iterator i = _vft.find(t);
+    if(i == _vft.end())
     {
-        _oft[t] = OFPair(f, 1);
+        _vft[t] = VFPair(f, 1);
     }
     else
     {
@@ -81,41 +92,41 @@ IceInternal::FactoryTable::addObjectFactory(const std::string& t, const Ice::Obj
 }
 
 //
-// Return the object factory for a given type ID
+// Return the value factory for a given type ID
 //
-Ice::ObjectFactoryPtr
-IceInternal::FactoryTable::getObjectFactory(const std::string& t) const
+ICE_DELEGATE(::Ice::ValueFactory)
+IceInternal::FactoryTable::getValueFactory(const string& t) const
 {
     IceUtil::Mutex::Lock lock(_m);
-    OFTable::const_iterator i = _oft.find(t);
-    return i != _oft.end() ? i->second.first : Ice::ObjectFactoryPtr();
+    VFTable::const_iterator i = _vft.find(t);
+    return i != _vft.end() ? i->second.first : ICE_DELEGATE(::Ice::ValueFactory)();
 }
 
 //
-// Remove a factory from the object factory table. If the factory
+// Remove a factory from the value factory table. If the factory
 // is not present, do nothing; otherwise, decrement the factory's
 // reference count if the count drops to zero, remove the factory's
 // entry from the table.
 //
 void
-IceInternal::FactoryTable::removeObjectFactory(const std::string& t)
+IceInternal::FactoryTable::removeValueFactory(const string& t)
 {
     IceUtil::Mutex::Lock lock(_m);
-    OFTable::iterator i = _oft.find(t);
-    if(i != _oft.end())
+    VFTable::iterator i = _vft.find(t);
+    if(i != _vft.end())
     {
         if(--i->second.second == 0)
         {
-            _oft.erase(i);
+            _vft.erase(i);
         }
     }
 }
 
 //
-// Add a factory to the object factory table.
+// Add a factory to the value factory table.
 //
 void
-IceInternal::FactoryTable::addTypeId(int compactId, const std::string& typeId)
+IceInternal::FactoryTable::addTypeId(int compactId, const string& typeId)
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(!typeId.empty() && compactId >= 0);
@@ -133,12 +144,12 @@ IceInternal::FactoryTable::addTypeId(int compactId, const std::string& typeId)
 //
 // Return the type ID for the given compact ID
 //
-std::string
+string
 IceInternal::FactoryTable::getTypeId(int compactId) const
 {
     IceUtil::Mutex::Lock lock(_m);
     TypeIdTable::const_iterator i = _typeIdTable.find(compactId);
-    return i != _typeIdTable.end() ? i->second.first : std::string();
+    return i != _typeIdTable.end() ? i->second.first : string();
 }
 
 void
@@ -154,5 +165,3 @@ IceInternal::FactoryTable::removeTypeId(int compactId)
         }
     }
 }
-
-

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

@@ -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.
@@ -80,7 +80,6 @@ IceInternal::FactoryTableInit::~FactoryTableInit()
     }
 }
 
-
 IceInternal::CompactIdInit::CompactIdInit(const char* typeId, int compactId) :
     _compactId(compactId)
 {
@@ -90,6 +89,5 @@ IceInternal::CompactIdInit::CompactIdInit(const char* typeId, int compactId) :
 
 IceInternal::CompactIdInit::~CompactIdInit()
 {
-    factoryTable->removeTypeId(_compactId);  
+    factoryTable->removeTypeId(_compactId);
 }
-

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

@@ -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.
@@ -9,6 +9,8 @@
 
 #include <Ice/GCObject.h>
 
+#ifndef ICE_CPP11_MAPPING
+
 #include <set>
 #include <stack>
 
@@ -16,7 +18,7 @@ using namespace std;
 using namespace IceUtil;
 using namespace IceInternal;
 
-namespace 
+namespace
 {
 
 typedef ::map<GCObject*, int> GCCountMap;
@@ -39,11 +41,11 @@ public:
 };
 
 Init init;
-    
+
 class ClearMembers : public GCVisitor
 {
 public:
-    
+
     virtual bool visit(GCObject*);
 };
 ClearMembers clearMembers;
@@ -51,7 +53,7 @@ ClearMembers clearMembers;
 class DecreaseRefCounts : public GCVisitor
 {
 public:
-    
+
     DecreaseRefCounts(GCCountMap&);
 
     virtual bool visit(GCObject*);
@@ -64,7 +66,7 @@ private:
 class RestoreRefCountsIfReachable : public GCVisitor
 {
 public:
-        
+
     RestoreRefCountsIfReachable(GCCountMap&);
 
     virtual bool visit(GCObject*);
@@ -109,7 +111,7 @@ private:
 class ClearCollectable : public GCVisitor
 {
 public:
-    
+
     virtual bool visit(GCObject*);
 };
 
@@ -125,7 +127,7 @@ DecreaseRefCounts::DecreaseRefCounts(GCCountMap& counts) : _counts(counts)
 {
 }
 
-bool 
+bool
 DecreaseRefCounts::visit(GCObject* obj)
 {
     //
@@ -140,10 +142,10 @@ DecreaseRefCounts::visit(GCObject* obj)
     GCCountMap::iterator p = _counts.find(obj);
     if(p == _counts.end())
     {
-        _counts.insert(make_pair(obj, obj->__getRefUnsafe() - 1));
+        _counts.insert(make_pair(obj, obj->_iceGetRefUnsafe() - 1));
         if(obj->__hasFlag(GCObject::Collectable))
         {
-            obj->__gcVisitMembers(*this);
+            obj->_iceGcVisitMembers(*this);
         }
     }
     else
@@ -157,7 +159,7 @@ RestoreRefCountsIfReachable::RestoreRefCountsIfReachable(GCCountMap& counts) : _
 {
 }
 
-bool 
+bool
 RestoreRefCountsIfReachable::visit(GCObject* obj)
 {
     GCCountMap::iterator p = _counts.find(obj);
@@ -168,7 +170,7 @@ RestoreRefCountsIfReachable::visit(GCObject* obj)
         // it's reachable.
         //
         return false;
-    } 
+    }
     else if(_reachable)
     {
         //
@@ -177,7 +179,7 @@ RestoreRefCountsIfReachable::visit(GCObject* obj)
         // reachable children.
         //
         _counts.erase(p);
-        obj->__gcVisitMembers(*this);
+        obj->_iceGcVisitMembers(*this);
     }
     else if(p->second == 0)
     {
@@ -187,7 +189,7 @@ RestoreRefCountsIfReachable::visit(GCObject* obj)
         // being visited again.
         //
         p->second = -1;
-        obj->__gcVisitMembers(*this);
+        obj->_iceGcVisitMembers(*this);
     }
     else if(p->second > 0)
     {
@@ -196,10 +198,10 @@ RestoreRefCountsIfReachable::visit(GCObject* obj)
         // and visit its sub-graph to remove children wobjects from
         // the counts map since they are also reachable.
         //
-        _counts.erase(p); 
-            
+        _counts.erase(p);
+
         _reachable = true;
-        obj->__gcVisitMembers(*this);
+        obj->_iceGcVisitMembers(*this);
         _reachable = false;
     }
     return false;
@@ -210,7 +212,7 @@ MarkCollectable::MarkCollectable() : _counter(0)
     _neighborsVisitor.setVisitor(this);
 }
 
-bool 
+bool
 MarkCollectable::visit(GCObject* obj)
 {
     //
@@ -227,12 +229,12 @@ MarkCollectable::visit(GCObject* obj)
         return false;
     }
     obj->__setFlag(GCObject::Collectable);
-        
+
     _numbers[obj] = ++_counter;
     _p.push(obj);
     _s.push(obj);
 
-    obj->__gcVisitMembers(_neighborsVisitor);
+    obj->_iceGcVisitMembers(_neighborsVisitor);
 
     if(_p.top() == obj)
     {
@@ -272,14 +274,14 @@ MarkCollectable::VisitNeighbors::setVisitor(MarkCollectable* visitor)
     _visitor = visitor;
 }
 
-bool 
+bool
 MarkCollectable::VisitNeighbors::visit(GCObject* obj)
 {
     _visitor->visitNeighbor(obj);
     return false;
 }
 
-bool 
+bool
 ClearCollectable::visit(GCObject* obj)
 {
     //
@@ -288,7 +290,7 @@ ClearCollectable::visit(GCObject* obj)
     if(obj->__hasFlag(GCObject::Collectable))
     {
         obj->__clearFlag(GCObject::Collectable | GCObject::CycleMember);
-        obj->__gcVisitMembers(*this);
+        obj->_iceGcVisitMembers(*this);
     }
     return false;
 }
@@ -354,7 +356,7 @@ IceInternal::GCObject::__setNoDelete(bool b)
 }
 
 bool
-GCObject::__gcVisit(GCVisitor& v)
+GCObject::_iceGcVisit(GCVisitor& v)
 {
     return v.visit(this);
 }
@@ -434,7 +436,7 @@ GCObject::collect(IceUtilInternal::MutexPtrLock<IceUtil::Mutex>& lock)
     }
     for(GCCountMap::const_iterator p = counts.begin(); p != counts.end(); ++p)
     {
-        p->first->__gcVisitMembers(clearMembers);
+        p->first->_iceGcVisitMembers(clearMembers);
     }
     for(GCCountMap::const_iterator p = counts.begin(); p != counts.end(); ++p)
     {
@@ -442,3 +444,4 @@ GCObject::collect(IceUtilInternal::MutexPtrLock<IceUtil::Mutex>& lock)
     }
     return true;
 }
+#endif

data/ext/ice/cpp/src/Ice/HashUtil.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.
@@ -31,7 +31,7 @@ hashAdd(Ice::Int& hashCode, const std::string& value)
     for(std::string::const_iterator p = value.begin(); p != value.end(); ++p)
     {
         hashCode = ((hashCode << 5) + hashCode) ^ *p;
-    }    
+    }
 }
 
 template<typename T> void
@@ -56,4 +56,3 @@ hashAdd(Ice::Int& hashCode, const std::map<K, V>& map)
 }
 
 #endif
-