zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.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/PushDisableWarnings.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.
@@ -15,6 +15,10 @@
 #   pragma warning(disable:4250) // ... : inherits ... via dominance
 #   pragma warning(disable:4251) // class ... needs to have dll-interface to be used by clients of class ...
 #   pragma warning(disable:4512) //  ... assignment operator could not be generated
+
+#   if _MSC_VER >= 1900
+#       pragma warning(disable:4275) // non dll-interface class ... used as base for dll-interface class ...
+#   endif
 #endif
 
 #if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))

data/ext/ice/cpp/include/IceUtil/Random.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/RecMutex.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/SHA1.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.
@@ -11,20 +11,11 @@
 #define ICE_UTIL_SHA1_H
 
 #include <IceUtil/Config.h>
+#include <IceUtil/UniquePtr.h>
 
 #include <vector>
 
-#ifndef ICE_OS_WINRT
-#   if defined(_WIN32)
-#      include <Wincrypt.h>
-#   elif defined(__APPLE__)
-#      include <CommonCrypto/CommonDigest.h>
-#   else
-#      include <openssl/sha.h>
-#   endif
-#endif
-
-namespace IceUtil
+namespace IceUtilInternal
 {
 
 ICE_UTIL_API void 
@@ -34,30 +25,21 @@ sha1(const unsigned char*, std::size_t, std::vector<unsigned char>&);
 class ICE_UTIL_API SHA1
 {
 public:
-    SHA1();
     
-#   ifdef _WIN32
+    SHA1();
     ~SHA1();
-#   endif
     
     void update(const unsigned char*, std::size_t);
-    
     void finalize(std::vector<unsigned char>&);
-
+    
 private:
-
+    
     // noncopyable
     SHA1(const SHA1&);
     SHA1 operator=(const SHA1&);
     
-#   if defined (_WIN32)
-    HCRYPTPROV _ctx;
-    HCRYPTHASH _hash;
-#   elif defined(__APPLE__)
-    CC_SHA1_CTX _ctx;
-#   else
-    SHA_CTX _ctx;
-#   endif
+    class Hasher;
+    IceUtil::UniquePtr<Hasher> _hasher;
 };
 #endif
 

data/ext/ice/cpp/include/IceUtil/ScannerConfig.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.
@@ -18,7 +18,7 @@
 // in flex generated Scanners are defined.
 //
 // in C99 conformant compilers we don't need to include it because the
-// header is included by inttypes.h, that is included by the gernated 
+// header is included by inttypes.h, that is included by the gernated
 // Scanners.
 //
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
@@ -26,17 +26,17 @@
 #endif
 
 //
-// Apple clang++ >= 5.1  deprecate 'register' storage class specifier
+// Clang++ >= 5.1  deprecate 'register' storage class specifier
 // used by lex generated Scanners.
 //
-#if defined(__clang__) && defined(__apple_build_version__) && __apple_build_version__ >= 5030038
+#if defined(__clang__)
 #   pragma clang diagnostic ignored "-Wdeprecated-register"
 #endif
 
 
 //
 // Avoid old style cast warnings in generated scanners
-// 
+//
 #ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif

data/ext/ice/cpp/include/IceUtil/ScopedArray.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/Shared.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.
@@ -11,34 +11,7 @@
 #define ICE_UTIL_SHARED_H
 
 #include <IceUtil/Config.h>
-
-#if defined(ICE_USE_MUTEX_SHARED)
-
-#   include <IceUtil/Mutex.h>
-
-// Using the gcc builtins requires gcc 4.1 or better. For Linux, i386
-// doesn't work. Apple is supported for all architectures. Sun only
-// supports sparc (32 and 64 bit).
-
-#elif ((defined(__GNUC__) && (((__GNUC__* 100) + __GNUC_MINOR__) >= 401)) || __clang__)  &&                         \
-        ((defined(__sun) && (defined(__sparc) || defined(__sparcv9))) || \
-         defined(__APPLE__) || \
-        (defined(__linux) && \
-                (defined(__i486) || defined(__i586) || \
-                 defined(__i686) || defined(__x86_64))))
-
-#   define ICE_HAS_GCC_BUILTINS
-
-#elif (defined(__APPLE__) || defined(__linux) || defined(__FreeBSD__)) && (defined(__i386) || defined(__x86_64)) && !defined(__ICC)
-
-#   define ICE_HAS_ATOMIC_FUNCTIONS
-
-#elif defined(_WIN32)
-// Nothing to include
-#else
-// Use a simple mutex
-#   include <IceUtil/Mutex.h>
-#endif
+#include <IceUtil/Atomic.h>
 
 //
 // Base classes for reference counted types. The IceUtil::Handle
@@ -152,14 +125,7 @@ public:
     
 protected:
 
-#if defined(_WIN32)
-    LONG _ref;
-#elif defined(ICE_HAS_ATOMIC_FUNCTIONS) || defined(ICE_HAS_GCC_BUILTINS)
-    volatile int _ref;
-#else
-    int _ref;
-    Mutex _mutex;
-#endif
+    IceUtilInternal::Atomic _ref;
     unsigned char _flags;
 };
 

data/ext/ice/cpp/include/IceUtil/StringUtil.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/Thread.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/ThreadException.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/Time.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/Timer.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/UUID.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/UndefSysMacros.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/UniquePtr.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/Slice/CPlusPlusUtil.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.
@@ -17,6 +17,7 @@ namespace Slice
 {
 
 SLICE_API extern FeatureProfile featureProfile;
+SLICE_API extern std::string paramPrefix;
 
 struct ToIfdef
 {
@@ -47,13 +48,13 @@ SLICE_API std::string fixKwd(const std::string&);
 SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, bool, int, const std::string&,
                                          bool, const StringList& = StringList(), int = 0, const std::string& = "",
                                          bool = true);
-                                             
-SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, int = 0);
-SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, int = 0);
-SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, int = 0);
+
+SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
+SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
+SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
 
 SLICE_API std::string getEndArg(const TypePtr&, const StringList&, const std::string&);
-SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&);
+SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool = false);
 
 SLICE_API std::string findMetaData(const StringList&, int = 0);
 SLICE_API bool inWstringModule(const SequencePtr&);

data/ext/ice/cpp/include/Slice/Checksum.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/Slice/CsUtil.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/Slice/DotNetNames.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/Slice/FileTracker.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/Slice/JavaUtil.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.
@@ -233,6 +233,8 @@ protected:
                             std::string&, std::string&) const;
     bool getSequenceTypes(const SequencePtr&, const std::string&, const StringList&, std::string&, std::string&) const;
 
+    bool sequenceHasHolder(const SequencePtr&) const;
+
     virtual JavaOutput* createOutput();
 
     static const std::string _getSetMetaData;

data/ext/ice/cpp/include/Slice/ObjCUtil.h

@@ -0,0 +1,127 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#ifndef OBJC_UTIL_H
+#define OBJC_UTIL_H
+
+#include <Slice/Parser.h>
+#include <IceUtil/OutputUtil.h>
+
+namespace Slice
+{
+
+enum BaseType
+{
+    BaseTypeNone,
+    BaseTypeObject,
+    BaseTypeException
+};
+
+class SLICE_API ObjCGenerator : private ::IceUtil::noncopyable
+{
+public:
+
+    virtual ~ObjCGenerator() {};
+
+    //
+    // Validate all metadata in the unit with an "objc:" prefix.
+    //
+    static void validateMetaData(const UnitPtr&);
+
+protected:
+    struct ModulePrefix
+    {
+        ModulePtr m;
+        std::string name;
+    };
+
+    static bool addModule(const ModulePtr&, const std::string&);
+    static ModulePrefix modulePrefix(const ModulePtr&);
+    static std::string moduleName(const ModulePtr&);
+    static ModulePtr findModule(const ContainedPtr&, int = 0, bool = false);
+    static void modulePrefixError(const ModulePtr&, const std::string&);
+    static std::string fixId(const std::string&, int = 0, bool = false);
+    static std::string fixId(const ContainedPtr&, int = 0, bool = false);
+    static std::string fixName(const ContainedPtr&, int = 0, bool = false);
+    static std::string fixScoped(const ContainedPtr&, int = 0, bool = false);
+    static std::string getParamId(const ContainedPtr&);
+    static std::string getFactoryMethod(const ContainedPtr&, bool);
+    static std::string typeToString(const TypePtr&);
+    static std::string inTypeToString(const TypePtr&, bool, bool = false, bool = false);
+    static std::string outTypeToString(const TypePtr&, bool, bool = false, bool = false);
+    static std::string typeToObjCTypeString(const TypePtr&);
+    static bool isValueType(const TypePtr&);
+    static bool isString(const TypePtr&);
+    static bool isClass(const TypePtr&);
+    static bool mapsToPointerType(const TypePtr&);
+    static std::string getBuiltinName(const BuiltinPtr&);
+    static std::string getBuiltinSelector(const BuiltinPtr&, bool);
+    static std::string getOptionalHelperGetter(const TypePtr&);
+    static std::string getOptionalStreamHelper(const TypePtr&);
+    static StringList splitScopedName(const std::string&);
+    static std::string getOptionalFormat(const TypePtr&);
+
+    //
+    // Generate code to marshal or unmarshal a type
+    //
+    void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool, bool) const;
+    void writeOptMemberMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool) const;
+    void writeOptParamMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, int,
+                                           bool) const;
+
+private:
+
+    class MetaDataVisitor : public ParserVisitor
+    {
+    public:
+        MetaDataVisitor();
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitExceptionEnd(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitStructEnd(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        virtual void visitParamDecl(const ParamDeclPtr&);
+        virtual void visitDataMember(const DataMemberPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+        virtual void visitEnum(const EnumPtr&);
+        virtual void visitConst(const ConstPtr&);
+
+    private:
+
+        void validate(const ContainedPtr&);
+
+        static Slice::StringList getMetaData(const ContainedPtr&);
+        static void modulePrefixError(const ModulePtr&, const std::string&);
+
+        static const std::string _objcPrefix; // "objc:"
+        static const std::string _msg; // "ignoring invalid metadata"
+
+        StringSet _history;
+    };
+
+
+    //
+    // Map of module scoped name to ModulePtr. Used to verify that objc:prefix metadata directives are consistent.
+    //
+
+    typedef std::map<std::string, ModulePrefix> ModuleMap;
+    static ModuleMap _modules;
+};
+
+}
+
+#endif