zeroc-ice 3.6b1 → 3.6.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Cond.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Config.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -22,7 +22,7 @@
 
 #if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
     defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
-    defined(__ARMEL__) || defined(_M_ARM_FP) || \
+    defined(__ARMEL__) || defined(_M_ARM_FP) || defined(__arm64) || \
     defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
 #   define ICE_LITTLE_ENDIAN
 #elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
@@ -38,6 +38,7 @@
 //
 #if defined(__sun) && (defined(__sparcv9) || defined(__x86_64))    || \
       defined(__linux) && defined(__x86_64)                        || \
+      defined(__APPLE__) && defined(__x86_64)                      || \
       defined(__hppa) && defined(__LP64__)                         || \
       defined(_ARCH_COM) && defined(__64BIT__)                     || \
       defined(__alpha__)                                           || \
@@ -49,7 +50,7 @@
 
 //
 // Check for C++ 11 support
-// 
+//
 // For GCC, we recognize --std=c++0x only for GCC version 4.5 and greater,
 // as C++11 support in prior releases was too limited.
 //
@@ -60,8 +61,7 @@
 #endif
 
 
-#if defined(ICE_CPP11) && !defined(_MSC_VER)
-// Visual Studio does not support noexcept yet
+#if defined(ICE_CPP11) && (!defined(_MSC_VER) || (_MSC_VER >= 1900))
 #   define ICE_NOEXCEPT noexcept
 #   define ICE_NOEXCEPT_FALSE noexcept(false)
 #else
@@ -86,7 +86,7 @@
 #endif
 
 //
-// Support for thread-safe function local static initialization 
+// Support for thread-safe function local static initialization
 // (a.k.a. "magic statics")
 //
 #if defined(__GNUC__) || defined(__clang__)
@@ -94,10 +94,10 @@
 #endif
 
 //
-// Compiler extensions to export and import symbols: see the documentation 
+// Compiler extensions to export and import symbols: see the documentation
 // for Visual Studio, Solaris Studio and GCC.
 //
-#if defined(_WIN32) && !defined(ICE_STATIC_LIBS)
+#if defined(_WIN32)
 #   define ICE_DECLSPEC_EXPORT __declspec(dllexport)
 #   define ICE_DECLSPEC_IMPORT __declspec(dllimport)
 //
@@ -118,8 +118,10 @@
 //
 // Let's use these extensions with IceUtil:
 //
-#ifdef ICE_UTIL_API_EXPORTS
+#if defined(ICE_UTIL_API_EXPORTS)
 #   define ICE_UTIL_API ICE_DECLSPEC_EXPORT
+#elif defined(ICE_STATIC_LIBS)
+#   define ICE_UTIL_API /**/
 #else
 #   define ICE_UTIL_API ICE_DECLSPEC_IMPORT
 #endif
@@ -129,14 +131,14 @@
 #   define ICE_DEPRECATED_API(msg) __declspec(deprecated(msg))
 #elif defined(__clang__)
 #   if __has_extension(attribute_deprecated_with_message)
-#       define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg)))          
+#       define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg)))
 #   else
 #       define ICE_DEPRECATED_API(msg) __attribute__((deprecated))
 #   endif
 #elif defined(__GNUC__)
 #   if (__GNUC__ > 4 || (__GNUC__ == 4 &&  __GNUC_MINOR__ >= 5))
 // The message option was introduced in GCC 4.5
-#      define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg)))          
+#      define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg)))
 #   else
 #      define ICE_DEPRECATED_API(msg) __attribute__((deprecated))
 #   endif
@@ -154,7 +156,7 @@
 #      ifndef ICE_HAS_WIN32_CONDVAR
 #          define ICE_HAS_WIN32_CONDVAR
 #      endif
-#   endif   
+#   endif
 #endif
 
 //
@@ -169,17 +171,23 @@
 #   include <errno.h>
 #endif
 
-#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT)
+#ifdef __APPLE__
+#   include <TargetConditionals.h>
+#endif
+
+#if !defined(ICE_BUILDING_ICE_UTIL) && defined(ICE_UTIL_API_EXPORTS)
+#   define ICE_BUILDING_ICE_UTIL
+#endif
+
+#if defined(_MSC_VER)
 #   if !defined(ICE_STATIC_LIBS) && (!defined(_DLL) || !defined(_MT))
 #       error "Only multi-threaded DLL libraries can be used with Ice!"
 #   endif
 //
 //  Automatically link with IceUtil[D].lib
 //
-#   if defined(ICE_STATIC_LIBS)
-#      pragma comment(lib, "IceUtil.lib")
-#   elif !defined(ICE_UTIL_API_EXPORTS)
-#      if defined(_DEBUG)
+#   if !defined(ICE_BUILDING_ICE_UTIL)
+#      if defined(_DEBUG) && !defined(ICE_OS_WINRT)
 #          pragma comment(lib, "IceUtilD.lib")
 #      else
 #          pragma comment(lib, "IceUtil.lib")
@@ -198,7 +206,7 @@ class ICE_UTIL_API noncopyable
 protected:
 
     noncopyable() { }
-    ~noncopyable() { } // May not be virtual! Classes without virtual 
+    ~noncopyable() { } // May not be virtual! Classes without virtual
                        // operations also derive from noncopyable.
 
 private:
@@ -215,12 +223,15 @@ private:
 #if defined(_WIN32) && defined(_MSC_VER)
 typedef __int64 Int64;
 #    define ICE_INT64(n) n##i64
+#    define ICE_INT64_FORMAT "l"
 #elif defined(ICE_64) && !defined(_WIN32)
 typedef long Int64;
 #    define ICE_INT64(n) n##L
+#    define ICE_INT64_FORMAT "l"
 #else
 typedef long long Int64;
 #    define ICE_INT64(n) n##LL
+#    define ICE_INT64_FORMAT "ll"
 #endif
 
 }
@@ -228,7 +239,7 @@ typedef long long Int64;
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.6b" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30651      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.6.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30600      // AABBCC, with AA=major, BB=minor, CC=patch
 
 #endif

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/CtrlCHandler.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/DisableWarnings.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -38,7 +38,14 @@
 // GCC
 //
 #if defined(__GNUC__)
-#   pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+//
+// Clang
+//
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,6 +13,7 @@
 #include <IceUtil/Config.h>
 
 #include <exception>
+#include <vector>
 
 namespace IceUtil
 {
@@ -33,14 +34,14 @@ public:
 
     const char* ice_file() const;
     int ice_line() const;
-    const std::string& ice_stackTrace() const;
+    std::string ice_stackTrace() const;
     
 private:
     
     const char* _file;
     int _line;
     static const char* _name;
-    const std::string _stackTrace;
+    const std::vector<void*> _stackFrames;
     mutable ::std::string _str; // Initialized lazily in what().
 };
 

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Handle.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/IceUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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 @@
 #include <IceUtil/AbstractMutex.h>
 #include <IceUtil/Cache.h>
 #include <IceUtil/Cond.h>
-#ifndef ICE_OS_WINRT
+#if !defined(__APPLE__) && !defined(ICE_OS_WINRT)
 #   include <IceUtil/CtrlCHandler.h>
 #endif
 #include <IceUtil/Exception.h>

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/InputUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Iterator.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Lock.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Monitor.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Mutex.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/MutexProtocol.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/MutexPtrLock.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/MutexPtrTryLock.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Optional.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/Options.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/IceUtil/OutputUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -37,17 +37,17 @@ public:
 
     OutputBase();
     OutputBase(std::ostream&);
-    OutputBase(const char*);
+    OutputBase(const std::string&);
     virtual ~OutputBase();
 
     void setIndent(int); // What is the indent level?
     void setUseTab(bool); // Should we output tabs?
 
-    void open(const char*); // Open output stream.
+    void open(const std::string&); // Open output stream.
     void close(); // Close output stream.
     bool isOpen(); // Is a file stream open?
 
-    virtual void print(const char*); // Print a string.
+    virtual void print(const std::string&); // Print a string.
 
     void inc(); // Increment indentation level.
     void dec(); // Decrement indentation level.
@@ -96,10 +96,7 @@ public:
     Output(std::ostream&);
     Output(const char*);
 
-    virtual void print(const char*); // Print a string.
-
-    void setBeginBlock(const char *); // what do we use at block starts?
-    void setEndBlock(const char *);   // what do we use the block end?
+    virtual void print(const std::string&); // Print a string.
 
     void sb(); // Start a block.
     void eb(); // End a block.
@@ -120,7 +117,7 @@ operator<<(Output& out, const T& val)
 {
     std::ostringstream s;
     s << val;
-    out.print(s.str().c_str());
+    out.print(s.str());
     return out;
 }
 
@@ -217,7 +214,7 @@ public:
     XMLOutput(std::ostream&);
     XMLOutput(const char*);
 
-    virtual void print(const char*); // Print a string.
+    virtual void print(const std::string&); // Print a string.
 
     virtual void newline(); // Print newline.
 
@@ -248,7 +245,7 @@ operator<<(XMLOutput& out, const T& val)
 {
     std::ostringstream s;
     s << val;
-    out.print(s.str().c_str());
+    out.print(s.str());
     return out;
 }