zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/include/IceUtil/FileUtil.h

@@ -0,0 +1,148 @@
+// **********************************************************************
+//
+// 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_FILE_UTIL_H
+#define ICE_FILE_UTIL_H
+
+#include <IceUtil/Config.h>
+#include <IceUtil/Shared.h>
+#include <IceUtil/Handle.h>
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+namespace IceUtilInternal
+{
+
+extern const ICE_API std::string pathsep;
+extern const ICE_API std::string separator;
+
+//
+// Detemine if path is an absolute path.
+//
+ICE_API bool isAbsolutePath(const std::string&);
+
+//
+// Determine if a file exists.
+//
+ICE_API bool fileExists(const std::string&);
+
+//
+// Determine if a directory exists.
+//
+ICE_API bool directoryExists(const std::string&);
+
+//
+// Determine if a directory exists and is empty.
+//
+ICE_API bool isEmptyDirectory(const std::string&);
+
+#ifdef _WIN32
+
+#if defined(__MINGW32__)
+typedef struct _stat structstat;
+#else
+typedef struct _stat64i32 structstat;
+#endif
+
+#ifdef _MSC_VER
+#ifndef O_RDONLY
+#   define O_RDONLY _O_RDONLY
+#endif
+
+#ifndef O_BINARY
+#   define O_BINARY _O_BINARY
+#endif
+
+#ifndef S_ISDIR
+#   define S_ISDIR(mode) ((mode) & _S_IFDIR)
+#endif
+
+#ifndef S_ISREG
+#   define S_ISREG(mode) ((mode) & _S_IFREG)
+#endif
+#endif
+
+#else
+
+typedef struct stat structstat;
+#   define O_BINARY 0
+
+#endif
+
+//
+// OS stat
+//
+ICE_API int stat(const std::string&, structstat*);
+ICE_API int remove(const std::string&);
+ICE_API int rename(const std::string&, const std::string&);
+ICE_API int rmdir(const std::string&);
+
+ICE_API int mkdir(const std::string&, int);
+ICE_API FILE* fopen(const std::string&, const std::string&);
+ICE_API FILE* freopen(const std::string&, const std::string&, FILE*);
+ICE_API int open(const std::string&, int);
+
+#ifndef ICE_OS_UWP
+ICE_API int getcwd(std::string&);
+#endif
+
+ICE_API int unlink(const std::string&);
+ICE_API int close(int);
+
+//
+// This class is used to implement process file locking. This class
+// is not intended to do file locking within the same process.
+//
+class ICE_API FileLock : public IceUtil::Shared, public IceUtil::noncopyable
+{
+public:
+    //
+    // The constructor opens the given file (eventually creating it)
+    // and acquires a lock on the file or throws FileLockException if
+    // the file couldn't be locked.
+    //
+    // If the lock can be acquired, the process pid is written to the
+    // file.
+    //
+    FileLock(const std::string&);
+
+    //
+    // The destructor releases the lock and removes the file.
+    //
+    virtual ~FileLock();
+
+private:
+
+#ifdef _WIN32
+    HANDLE _fd;
+#else
+    int _fd;
+#endif
+    std::string _path;
+};
+
+typedef IceUtil::Handle<FileLock> FileLockPtr;
+
+//
+// Use streamFilename to construct the filename given to std stream classes
+// like ifstream and ofstream.
+//
+#if defined(_WIN32) && !defined(__MINGW32__)
+ICE_API std::wstring streamFilename(const std::string&);
+#else
+inline std::string streamFilename(const std::string& filename)
+{
+    return filename;
+}
+#endif
+
+}
+#endif

data/ext/ice/cpp/include/IceUtil/Functional.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.
@@ -386,4 +386,3 @@ secondConstVoidMemFun1(void (T::*p)(A) const)
 }
 
 #endif
-

data/ext/ice/cpp/include/IceUtil/Handle.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.
@@ -26,7 +26,7 @@ class HandleBase
 public:
 
     typedef T element_type;
-    
+
     T* get() const
     {
         return _ptr;
@@ -43,7 +43,7 @@ public:
             // than just a function call). This maximises the chances
             // of inlining by compiler optimization.
             //
-            throwNullHandleException(__FILE__, __LINE__);           
+            throwNullHandleException(__FILE__, __LINE__);
         }
 
         return _ptr;
@@ -60,7 +60,7 @@ public:
             // than just a function call). This maximises the chances
             // of inlining by compiler optimization.
             //
-            throwNullHandleException(__FILE__, __LINE__);           
+            throwNullHandleException(__FILE__, __LINE__);
         }
 
         return *_ptr;
@@ -83,7 +83,7 @@ private:
     void throwNullHandleException(const char *, int) const;
 };
 
-template<typename T> inline void 
+template<typename T> inline void
 HandleBase<T>::throwNullHandleException(const char* file, int line) const
 {
     throw NullHandleException(file, line);
@@ -147,7 +147,7 @@ template<typename T>
 class Handle : public HandleBase<T>
 {
 public:
-    
+
     Handle(T* p = 0)
     {
         this->_ptr = p;
@@ -157,7 +157,7 @@ public:
             this->_ptr->__incRef();
         }
     }
-    
+
     template<typename Y>
     Handle(const Handle<Y>& r)
     {
@@ -178,7 +178,7 @@ public:
             this->_ptr->__incRef();
         }
     }
-    
+
     ~Handle()
     {
         if(this->_ptr)
@@ -186,7 +186,7 @@ public:
             this->_ptr->__decRef();
         }
     }
-    
+
     Handle& operator=(T* p)
     {
         if(this->_ptr != p)
@@ -206,7 +206,7 @@ public:
         }
         return *this;
     }
-        
+
     template<typename Y>
     Handle& operator=(const Handle<Y>& r)
     {
@@ -247,7 +247,7 @@ public:
         }
         return *this;
     }
-        
+
     template<class Y>
     static Handle dynamicCast(const HandleBase<Y>& r)
     {

data/ext/ice/cpp/include/IceUtil/IceUtil.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.
@@ -13,15 +13,14 @@
 #include <IceUtil/PushDisableWarnings.h>
 
 //
-// This file must include *all* other headers of IceUtil, except
+// This file must include *all* headers of IceUtil, except
 // for DisableWarnings.h and headers with only IceUtilInternal symbols
 //
 
 #include <IceUtil/Config.h>
-#include <IceUtil/AbstractMutex.h>
-#include <IceUtil/Cache.h>
 #include <IceUtil/Cond.h>
-#if !defined(__APPLE__) && !defined(ICE_OS_WINRT)
+#include <IceUtil/ConsoleUtil.h>
+#if !defined(ICE_OS_UWP) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
 #   include <IceUtil/CtrlCHandler.h>
 #endif
 #include <IceUtil/Exception.h>
@@ -41,11 +40,6 @@
 #include <IceUtil/Time.h>
 #include <IceUtil/Timer.h>
 #include <IceUtil/UUID.h>
-#include <IceUtil/UniquePtr.h>
-
-#ifndef _WIN32
-#   include <IceUtil/IconvStringConverter.h>
-#endif
 
 #include <IceUtil/PopDisableWarnings.h>
 #endif

data/ext/ice/cpp/include/IceUtil/InputUtil.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,7 +19,7 @@ namespace IceUtilInternal
 //
 // Portable strtoll/_strtoi64
 //
-ICE_UTIL_API IceUtil::Int64 strToInt64(const char*, char**, int);
+ICE_API IceUtil::Int64 strToInt64(const char*, char**, int);
 
 //
 // stringToInt64 converts a string into a signed 64-bit integer.
@@ -40,7 +40,7 @@ ICE_UTIL_API IceUtil::Int64 strToInt64(const char*, char**, int);
 //      - result == 0 indicates that no digits were available for conversion
 //      - result == "Int64 Min" or result == "Int64 Max" indicate underflow or overflow.
 //
-ICE_UTIL_API  bool stringToInt64(const std::string&, IceUtil::Int64&);
+ICE_API  bool stringToInt64(const std::string&, IceUtil::Int64&);
 
 }
 

data/ext/ice/cpp/include/IceUtil/Iterator.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.
@@ -20,7 +20,7 @@ inline typename ForwardIterator::difference_type
 distance(ForwardIterator first, ForwardIterator last)
 {
 //
-// Work-around for a limitation in the standard library provided 
+// Work-around for a limitation in the standard library provided
 // with the Sun C++ 5.x compilers
 #if defined(__SUNPRO_CC) && defined(_RWSTD_NO_CLASS_PARTIAL_SPEC)
 

data/ext/ice/cpp/include/IceUtil/Lock.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,13 +21,12 @@ namespace IceUtil
 //
 class Cond;
 
-
 // LockT and TryLockT are the preferred construct to lock/tryLock/unlock
 // simple and recursive mutexes. You typically allocate them on the
 // stack to hold a lock on a mutex.
-// LockT and TryLockT are not recursive: you cannot acquire several times 
+// LockT and TryLockT are not recursive: you cannot acquire several times
 // in a row a lock with the same Lock or TryLock object.
-// 
+//
 // We must name this LockT instead of Lock, because otherwise some
 // compilers (such as Sun C++ 5.4) have problems with constructs
 // such as:
@@ -42,7 +41,7 @@ template <typename T>
 class LockT
 {
 public:
-    
+
     LockT(const T& mutex) :
         _mutex(mutex)
     {
@@ -57,7 +56,7 @@ public:
             _mutex.unlock();
         }
     }
-    
+
     void acquire() const
     {
         if (_acquired)
@@ -68,7 +67,6 @@ public:
         _acquired = true;
     }
 
-
     bool tryAcquire() const
     {
         if (_acquired)
@@ -93,9 +91,9 @@ public:
     {
         return _acquired;
     }
-   
+
 protected:
-    
+
     // TryLockT's contructor
     LockT(const T& mutex, bool) :
         _mutex(mutex)
@@ -104,7 +102,7 @@ protected:
     }
 
 private:
-    
+
     // Not implemented; prevents accidental use.
     //
     LockT(const LockT&);

data/ext/ice/cpp/include/IceUtil/Monitor.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.
@@ -215,7 +215,6 @@ IceUtil::Monitor<T>::notifyAll()
     _nnotify = -1;
 }
 
-
 template <class T> inline void
 IceUtil::Monitor<T>::notifyImpl(int nnotify) const
 {

data/ext/ice/cpp/include/IceUtil/Mutex.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.
@@ -33,7 +33,7 @@ class Cond;
 // `IceUtil::noncopyable' inaccessible in `IceInternal::Outgoing' due
 // to ambiguity
 //
-class ICE_UTIL_API Mutex
+class ICE_API Mutex
 {
 public:
 
@@ -51,7 +51,7 @@ public:
     // Note that lock/tryLock & unlock in general should not be used
     // directly. Instead use Lock & TryLock.
     //
- 
+
     void lock() const;
 
     //
@@ -64,9 +64,9 @@ public:
     //
     // Returns true if the mutex will unlock when calling unlock()
     // (false otherwise). For non-recursive mutexes, this will always
-    // return true. 
-    // This function is used by the Monitor implementation to know whether 
-    // the Mutex has been locked for the first time, or unlocked for the 
+    // return true.
+    // This function is used by the Monitor implementation to know whether
+    // the Mutex has been locked for the first time, or unlocked for the
     // last time (that is another thread is able to acquire the mutex).
     // Pre-condition: the mutex must be locked.
     //
@@ -88,7 +88,7 @@ private:
     {
 #   ifdef ICE_HAS_WIN32_CONDVAR
         CRITICAL_SECTION* mutex;
-#   endif 
+#   endif
     };
 #else
     struct LockState
@@ -141,7 +141,7 @@ Mutex::Mutex(MutexProtocol protocol)
 inline void
 Mutex::init(MutexProtocol)
 {
-#ifdef ICE_OS_WINRT
+#ifdef ICE_OS_UWP
     InitializeCriticalSectionEx(&_mutex, 0, 0);
 #else
     InitializeCriticalSection(&_mutex);
@@ -158,7 +158,13 @@ inline void
 Mutex::lock() const
 {
     EnterCriticalSection(&_mutex);
-    assert(_mutex.RecursionCount == 1);
+#ifndef NDEBUG
+    if(_mutex.RecursionCount > 1)
+    {
+        LeaveCriticalSection(&_mutex);
+        throw ThreadLockedException(__FILE__, __LINE__);
+    }
+#endif
 }
 
 inline bool
@@ -211,7 +217,7 @@ Mutex::lock(LockState&) const
 #else
 
 inline void
-Mutex::init(MutexProtocol 
+Mutex::init(MutexProtocol
 #if defined(_POSIX_THREAD_PRIO_INHERIT) && _POSIX_THREAD_PRIO_INHERIT > 0
             protocol
 #endif
@@ -344,7 +350,7 @@ Mutex::lock(LockState&) const
 {
 }
 
-#endif    
+#endif
 
 inline bool
 Mutex::willUnlock() const