zeroc-ice 3.6.3 → 3.6.4

data/ext/ice/cpp/src/Slice/DotNetNames.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/FileTracker.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/Grammar.cpp

@@ -81,7 +81,7 @@
 
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/GrammarUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/JavaUtil.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.
@@ -280,7 +280,7 @@ Slice::JavaOutput::printHeader()
     static const char* header =
 "// **********************************************************************\n"
 "//\n"
-"// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\n"
+"// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.\n"
 "//\n"
 "// This copy of Ice is licensed to you under the terms described in the\n"
 "// ICE_LICENSE file included in this distribution.\n"

data/ext/ice/cpp/src/Slice/MD5.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/MD5.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/ObjCUtil.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/PHPUtil.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/Parser.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/Preprocessor.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.
@@ -365,18 +365,46 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
 
     //
     // We now need to massage the result to get the desired output.
-    // First make it a single line.
+    // First remove the backslash used to escape new lines.
     //
     string::size_type pos;
-    while((pos = unprocessed.find("\\\n")) != string::npos)
+    while((pos = unprocessed.find(" \\\n")) != string::npos)
     {
-        unprocessed.replace(pos, 2, "");
+        unprocessed.replace(pos, 3, "\n");
     }
 
+    //
+    // Split filenames in separate lines:
+    //
+    // /foo/A.ice /foo/B.ice becomes
+    // /foo/A.ice
+    // /foo/B.ice
+    //
+    // C:\foo\A.ice C:\foo\B.ice becomes
+    // C:\foo\A.ice
+    // C:\foo\B.ice
+    //
+    pos = 0;
+#ifdef _WIN32
+    while((pos = unprocessed.find(".ice ", pos)) != string::npos)
+    {
+        if(unprocessed.find(":", pos) == pos + 6)
+        {
+            unprocessed.replace(pos, 5, ".ice\n");
+            pos += 5;
+        }
+    }
+#else
+    while((pos = unprocessed.find(".ice /", pos)) != string::npos)
+    {
+        unprocessed.replace(pos, 5, ".ice\n");
+    }
+#endif
+
     //
     // Get the main output file name.
     //
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
      string suffix = ".obj:";
 #else
      string suffix = ".o:";
@@ -389,7 +417,6 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
     }
 
     vector<string> fullIncludePaths;
-
     for(vector<string>::const_iterator p = includePaths.begin(); p != includePaths.end(); ++p)
     {
         fullIncludePaths.push_back(fullPath(*p));
@@ -398,81 +425,83 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
     //
     // Process each dependency.
     //
-
     string sourceFile;
     vector<string> dependencies;
 
     string::size_type end;
-    while((end = unprocessed.find(".ice", pos)) != string::npos)
+    while((end = unprocessed.find("\n", pos)) != string::npos)
     {
-        end += 4;
+        end += 1;
         string file = IceUtilInternal::trim(unprocessed.substr(pos, end - pos));
-        if(IceUtilInternal::isAbsolutePath(file))
+        if(file.rfind(".ice") == file.size() - 4)
         {
-            if(file == _fileName)
-            {
-                file = _shortFileName;
-            }
-            else
+            if(IceUtilInternal::isAbsolutePath(file))
             {
-                //
-                // Transform back full paths generated by mcpp to paths relative to the specified
-                // include paths.
-                //
-                string newFile = file;
-                for(vector<string>::const_iterator p = fullIncludePaths.begin(); p != fullIncludePaths.end(); ++p)
+                if(file == _fileName)
+                {
+                    file = _shortFileName;
+                }
+                else
                 {
-                    if(file.compare(0, p->length(), *p) == 0)
+                    //
+                    // Transform back full paths generated by mcpp to paths relative to the specified
+                    // include paths.
+                    //
+                    string newFile = file;
+                    for(vector<string>::const_iterator p = fullIncludePaths.begin(); p != fullIncludePaths.end(); ++p)
                     {
-                        string s = includePaths[p - fullIncludePaths.begin()] + file.substr(p->length());
-                        if(IceUtilInternal::isAbsolutePath(newFile) || s.size() < newFile.size())
+                        if(file.compare(0, p->length(), *p) == 0)
                         {
-                            newFile = s;
+                            string s = includePaths[p - fullIncludePaths.begin()] + file.substr(p->length());
+                            if(IceUtilInternal::isAbsolutePath(newFile) || s.size() < newFile.size())
+                            {
+                                newFile = s;
+                            }
                         }
                     }
+                    file = newFile;
                 }
-                file = newFile;
             }
-        }
 
-        if(lang == SliceXML)
-        {
-            if(result.size() == 0)
-            {
-                result = "  <source name=\"" + file + "\">";
-            }
-            else
+            if(lang == SliceXML)
             {
-                result += "\n    <dependsOn name=\"" + file + "\"/>";
+                if(result.size() == 0)
+                {
+                    result = "  <source name=\"" + file + "\">";
+                }
+                else
+                {
+                    result += "\n    <dependsOn name=\"" + file + "\"/>";
+                }
             }
-        }
-        else if(lang == JavaScriptJSON)
-        {
-            if(sourceFile.empty())
+            else if(lang == JavaScriptJSON)
             {
-                sourceFile = file;
+                if(sourceFile.empty())
+                {
+                    sourceFile = file;
+                }
+                else
+                {
+                    dependencies.push_back(file);
+                }
             }
             else
             {
-                dependencies.push_back(file);
-            }
-        }
-        else
-        {
-            //
-            // Escape spaces in the file name.
-            //
-            string::size_type space = 0;
-            while((space = file.find(" ", space)) != string::npos)
-            {
-                file.replace(space, 1, "\\ ");
-                space += 2;
-            }
+                //
+                // Escape spaces in the file name.
+                //
+                string::size_type space = 0;
+                while((space = file.find(" ", space)) != string::npos)
+                {
+                    file.replace(space, 1, "\\ ");
+                    space += 2;
+                }
 
-            //
-            // Add to result
-            //
-            result += " \\\n " + file;
+                //
+                // Add to result
+                //
+                result += " \\\n " + file;
+            }
         }
         pos = end;
     }

data/ext/ice/cpp/src/Slice/Python.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/PythonUtil.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.
@@ -3080,7 +3080,7 @@ Slice::Python::printHeader(IceUtilInternal::Output& out)
     static const char* header =
 "# **********************************************************************\n"
 "#\n"
-"# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\n"
+"# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.\n"
 "#\n"
 "# This copy of Ice is licensed to you under the terms described in the\n"
 "# ICE_LICENSE file included in this distribution.\n"

data/ext/ice/cpp/src/Slice/Ruby.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/cpp/src/Slice/RubyUtil.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.
@@ -1005,13 +1005,10 @@ Slice::Ruby::CodeVisitor::visitStructStart(const StructPtr& p)
     _out.inc();
     _out << nl << "return false if";
     _out.inc();
+    _out << " !other.is_a? " << getAbsolute(p, IdentToUpper);
     for(MemberInfoList::iterator r = memberList.begin(); r != memberList.end(); ++r)
     {
-        if(r != memberList.begin())
-        {
-            _out << " or";
-        }
-        _out << nl << "@" << r->fixedName << " != other." << r->fixedName;
+        _out << " or" << nl << "@" << r->fixedName << " != other." << r->fixedName;
     }
     _out.dec();
     _out << nl << "true";
@@ -1820,7 +1817,7 @@ Slice::Ruby::printHeader(IceUtilInternal::Output& out)
     static const char* header =
 "# **********************************************************************\n"
 "#\n"
-"# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\n"
+"# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.\n"
 "#\n"
 "# This copy of Ice is licensed to you under the terms described in the\n"
 "# ICE_LICENSE file included in this distribution.\n"

data/ext/ice/cpp/src/Slice/Scanner.cpp

@@ -557,7 +557,7 @@ char *slice_text;
 
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.
@@ -1207,6 +1207,7 @@ YY_RULE_SETUP
                 case '3':
                 case '4':
                 case '5':
+                case '6':
                 case '7':
                 {
                     static string octalDigits = "01234567";

data/ext/ice/cpp/src/Slice/Util.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2016 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.

data/ext/ice/mcpp/Makefile

@@ -1,12 +1,14 @@
 # **********************************************************************
 #
-# Copyright (c) 2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2015-2017 ZeroC, Inc. All rights reserved.
 #
 # **********************************************************************
 
 PREFIX ?= /opt/mcpp-2.7.2
 
-CFLAGS += -O -w
+ifeq ($(CFLAGS),)
+	CFLAGS = -O2
+endif
 
 UNAME = $(shell uname)
 MACHINE = $(shell uname -m)
@@ -14,47 +16,38 @@ MACHINE = $(shell uname -m)
 LIBDIR = lib
 
 ifeq ($(UNAME),Darwin)
-	CFLAGS += -mmacosx-version-min=10.9
+        override CFLAGS += -mmacosx-version-min=10.9
 endif
 
 ifeq ($(UNAME),Linux)
-	CFLAGS += -fPIC
-
-	ifeq ($(MACHINE),i686)
-	CFLAGS += -m32
+        override CFLAGS += -fPIC -Wno-maybe-uninitialized -Wno-implicit-function-declaration -Wno-unused-result
 
-	#
-	# Ubuntu.
-	#
-	ifeq ($(shell test -d /usr/lib/i386-linux-gnu && echo 0),0)
-		LIBDIR = lib/i386-linux-gnu
-	endif
-	else
-	#
-	# Ubuntu.
-	#
-	ifeq ($(shell test -d /usr/lib/x86_64-linux-gnu && echo 0),0)
-		LIBDIR = lib/x86_64-linux-gnu
-	endif
-
-	#
-	# Rhel/SLES
-	#
-	ifeq ($(shell test -d /usr/lib64 && echo 0),0)
-		LIBDIR = lib64
-	endif
-	endif
+        ifeq ($(MACHINE),i686)
+                override CFLAGS += -m32
+                #
+                # Ubuntu.
+                #
+                ifeq ($(shell test -d /usr/lib/i386-linux-gnu && echo 0),0)
+                        LIBDIR = lib/i386-linux-gnu
+                endif
+        else
+                #
+                # Ubuntu.
+                #
+                ifeq ($(shell test -d /usr/lib/x86_64-linux-gnu && echo 0),0)
+                        LIBDIR = lib/x86_64-linux-gnu
+                endif
+                #
+                # Rhel/SLES
+                #
+                ifeq ($(shell test -d /usr/lib64 && echo 0),0)
+                        LIBDIR = lib64
+                endif
+        endif
 endif
 
 ifeq ($(UNAME),AIX)
-	CC ?= xlc_r
-endif
-
-#
-# The default C compiler (cc) is undefined with MinGW
-#
-ifneq ($(findstring MINGW,$(UNAME)),)
-	CC ?= gcc
+        CC ?= xlc_r
 endif
 
 OBJS = directive.o eval.o expand.o main.o mbchar.o support.o system.o
@@ -65,12 +58,8 @@ $(LIBDIR)/libmcpp.a: $(OBJS)
 	ranlib $(LIBDIR)/libmcpp.a
 
 install: $(LIBDIR)/libmcpp.a
-ifneq ($(findstring MINGW,$(UNAME)),)
-	cp $(LIBDIR)/libmcpp.a $(PREFIX)
-else
-	@mkdir -p $(PREFIX)/lib
-	cp $(LIBDIR)/libmcpp.a $(PREFIX)/lib
-endif
+	@mkdir -p $(PREFIX)/$(LIBDIR)
+	cp $(LIBDIR)/libmcpp.a $(PREFIX)/$(LIBDIR)
 
 clean:
 	rm -f $(OBJS)