zeroc-ice 3.7.1 → 3.7.6

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

@@ -1,13 +1,7 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <Slice/Util.h>
 #include <Slice/FileTracker.h>
 #include <IceUtil/FileUtil.h>
@@ -397,7 +391,7 @@ Slice::writeDependencies(const string& dependencies, const string& dependFile)
         if(!of)
         {
             ostringstream os;
-            os << "cannot open file `" << dependFile << "': " << strerror(errno);
+            os << "cannot open file `" << dependFile << "': " << IceUtilInternal::errorToString(errno);
             throw Slice::FileException(__FILE__, __LINE__, os.str());
         }
         of << dependencies;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <Slice/Util.h>
 
@@ -202,6 +197,11 @@ StringLiteralGenerator::escapeASCIIChar(char c)
             os << "\\" << oct << setfill('0') << setw(3) << static_cast<unsigned int>(c & 0xFF);
             _format = OctalFormat;
         }
+        else if(_escapeMode == EC6UCN)
+        {
+            os << "\\u{" << hex << setfill('0') << setw(4) << static_cast<unsigned int>(c & 0xFF) << "}";
+            _format = HexFormat;
+        }
         else
         {
             os << _shortUCNPrefix << hex << setfill('0') << setw(4) << static_cast<unsigned int>(c & 0xFF);
@@ -236,7 +236,11 @@ StringLiteralGenerator::escapeCodePoint(unsigned int codePoint)
     else
     {
         ostringstream os;
-        if(codePoint < _cutOff)
+        if(_escapeMode == EC6UCN)
+        {
+            os << "\\u{" << hex << codePoint << "}";
+        }
+        else if(codePoint < _cutOff)
         {
             //
             // Output octal escape
@@ -260,10 +264,6 @@ StringLiteralGenerator::escapeCodePoint(unsigned int codePoint)
             os << _shortUCNPrefix << setfill('0') << setw(4) << hex << lowSurrogate;
             _format = HexFormat;
         }
-        else if(_escapeMode == EC6UCN)
-        {
-            os << "\\u{" << hex << codePoint << "}";
-        }
         else
         {
             os << "\\U" << setfill('0') << setw(8) << hex << codePoint;
@@ -365,7 +365,7 @@ Slice::toStringLiteral(const string& value,
                                 // keep this escape as is
                                 os << "\\" << c << codePointStr;
                             }
-                            else if(c == 'u')
+                            else if(c == 'u' && escapeMode != EC6UCN)
                             {
                                 os << (escapeMode == Matlab ? "\\x" : "\\u") << codePointStr;
                                 generator.format(StringLiteralGenerator::HexFormat);

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 SLICE_UTIL_H
 #define SLICE_UTIL_H

data/ext/ice/mcpp/CMakeLists.txt

@@ -0,0 +1,80 @@
+cmake_minimum_required(VERSION 3.7.2)
+
+if(APPLE)
+	set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum macOS deployment version")
+endif()
+
+# handle debug lib naming based on shipped project naming
+if(NOT CMAKE_DEBUG_POSTFIX)
+	set(CMAKE_DEBUG_POSTFIX d)
+endif()
+
+project(mcpp VERSION 2.7.2.14)
+
+add_library(mcpp STATIC
+	"config.h"
+	"configed.H"
+	"directive.c"
+	"eval.c"
+	"expand.c"
+	"internal.H"
+	"main.c"
+	"mbchar.c"
+	"support.c"
+	"system.c"
+	"system.H"
+)
+
+target_sources(mcpp PUBLIC
+	"${CMAKE_CURRENT_SOURCE_DIR}/mcpp_lib.h"
+	"${CMAKE_CURRENT_SOURCE_DIR}/mcpp_out.h"
+)
+
+if(UNIX)
+	include(GNUInstallDirs)
+    
+	set_property(TARGET mcpp PROPERTY PUBLIC_HEADER 
+		"mcpp_lib.h" 
+		"mcpp_out.h"
+	)
+
+	target_compile_options(mcpp PRIVATE "-O2")
+
+	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+		set_property(TARGET mcpp PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+		target_compile_options(mcpp PRIVATE
+			"-Wno-maybe-uninitialized"
+			"-Wno-unused-result"
+		)
+	endif()
+
+	install(TARGETS mcpp
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+	)
+elseif(WIN32)
+	# define character set - not set, per shipped project files
+	add_definitions(-D_SBCS)
+    
+	target_compile_definitions(mcpp PRIVATE
+		"_WIN32_WINNT=0x600"
+		"WIN32_LEAN_AND_MEAN"
+	)
+
+	if(MSVC)
+		target_compile_definitions(mcpp PRIVATE
+			"_CRT_SECURE_NO_WARNINGS"
+		)
+
+		target_compile_options(mcpp PRIVATE
+			"/wd4996"
+			"/wd4244"
+			"/wd4246"
+			"/wd4267"
+			"/wd4146"
+			"/wd4018"
+		)
+	endif()
+endif()
+install(TARGETS mcpp DESTINATION lib)

data/ext/ice/mcpp/Makefile

@@ -1,8 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2015-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 PREFIX ?= /opt/mcpp-2.7.2
 
@@ -54,8 +52,7 @@ OBJS = directive.o eval.o expand.o main.o mbchar.o support.o system.o
 
 $(LIBDIR)/libmcpp.a: $(OBJS)
 	-mkdir -p $(LIBDIR)
-	ar rcs $(LIBDIR)/libmcpp.a $(OBJS)
-	ranlib $(LIBDIR)/libmcpp.a
+	$(AR) rcs $(LIBDIR)/libmcpp.a $(OBJS)
 
 install: $(LIBDIR)/libmcpp.a
 	@mkdir -p $(PREFIX)/$(LIBDIR)

data/ext/ice/mcpp/expand.c

@@ -376,7 +376,7 @@ static int  print_macro_inf(
  * Enabled by '#pragma MCPP debug macro_call' or -K option in STD mode.
  */
 {
-    MACRO_INF *     m_inf;
+    MACRO_INF *     m_inf = NULL;
     int     num;
     int     num_args;   /* Number of actual args (maybe less than expected) */
     int     i;
@@ -473,7 +473,7 @@ static char *   replace(
         /* Number of actual arguments (maybe less than expected)    */
     int     enable_trace_macro;     /* To exclude _Pragma() pseudo macro    */
     int     m_num = 0;              /* 'mac_num' of current macro   */
-    MACRO_INF *     m_inf;          /* Pointer into mac_inf[]       */
+    MACRO_INF *     m_inf = NULL;          /* Pointer into mac_inf[]       */
 
     if (mcpp_debug & EXPAND) {
         dump_a_def( "replace entry", defp, FALSE, TRUE, fp_debug);
@@ -1187,7 +1187,7 @@ static char *     remove_magics(
     mac_n = arg_n = n = 0;
 
     while ((*tp++ = c = get_ch()) != RT_END && file == infile) {
-        char ** loc_tab;
+        char ** loc_tab = NULL;
         int     num, mark, rm, magic;
         size_t  len;
 
@@ -1493,7 +1493,7 @@ static char *   rescan(
     char *  tp = NULL;              /* Temporary pointer into buffer*/
     char *  out_p = out;            /* Current output pointer       */
     FILEINFO *  file;       /* Input sequences stacked on a "file"  */
-    DEFBUF *    inner;              /* Inner macro to replace       */
+    DEFBUF *    inner = NULL;              /* Inner macro to replace       */
     int     c;                      /* First character of token     */
     int     token_type;
     char *  mac_arg_start = NULL;
@@ -1771,8 +1771,8 @@ static int  collect_args(
     int     nargs = 0;                  /* Number of collected args */
     int     var_arg = defp->nargs & VA_ARGS;    /* Variable args    */
     int     more_to_come = FALSE;       /* Next argument is expected*/
-    LOCATION *  locs;           /* Location of args in source file  */
-    LOCATION *  loc;                            /* Current locs     */
+    LOCATION *  locs = NULL;    /* Location of args in source file  */
+    LOCATION *  loc = NULL;                     /* Current locs     */
     MAGIC_SEQ   mgc_prefix;     /* MAC_INF seqs and spaces preceding an arg */
     int     c;
 

data/ice.gemspec

@@ -1,12 +1,10 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
 #
-# **********************************************************************
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
-  s.version     = '3.7.1'
+  s.version     = '3.7.6'
   s.summary     = "ZeroC Ice for Ruby"
   s.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven

data/lib/Glacier2.rb

@@ -1,11 +1,6 @@
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.
-#
-# **********************************************************************
 
 require 'Glacier2/Router'
 require 'Glacier2/PermissionsVerifier'

data/lib/Glacier2/Metrics.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.7.1
+# Ice version 3.7.6
 #
 # <auto-generated>
 #
@@ -22,7 +17,7 @@
 require 'Ice'
 require 'Ice/Metrics.rb'
 
-module IceMX
+module ::IceMX
 
     if not defined?(::IceMX::SessionMetrics_Mixin)
 

data/lib/Glacier2/PermissionsVerifier.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.7.1
+# Ice version 3.7.6
 #
 # <auto-generated>
 #
@@ -22,7 +17,7 @@
 require 'Ice'
 require 'Glacier2/SSLInfo.rb'
 
-module Glacier2
+module ::Glacier2
 
     if not defined?(::Glacier2::PermissionDeniedException)
         class PermissionDeniedException < Ice::UserException

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.7.1
+# Ice version 3.7.6
 #
 # <auto-generated>
 #
@@ -21,7 +16,7 @@
 
 require 'Ice'
 
-module Glacier2
+module ::Glacier2
 
     if not defined?(::Glacier2::T_PermissionsVerifier)
         T_PermissionsVerifier = ::Ice::__declareClass('::Glacier2::PermissionsVerifier')

data/lib/Glacier2/Router.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.7.1
+# Ice version 3.7.6
 #
 # <auto-generated>
 #
@@ -24,7 +19,7 @@ require 'Ice/Router.rb'
 require 'Glacier2/Session.rb'
 require 'Glacier2/PermissionsVerifier.rb'
 
-module Glacier2
+module ::Glacier2
 
     if not defined?(::Glacier2::SessionNotExistException)
         class SessionNotExistException < Ice::UserException

data/lib/Glacier2/RouterF.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.7.1
+# Ice version 3.7.6
 #
 # <auto-generated>
 #
@@ -21,7 +16,7 @@
 
 require 'Ice'
 
-module Glacier2
+module ::Glacier2
 
     if not defined?(::Glacier2::T_Router)
         T_Router = ::Ice::__declareClass('::Glacier2::Router')

data/lib/Glacier2/SSLInfo.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.7.1
+# Ice version 3.7.6
 #
 # <auto-generated>
 #
@@ -22,7 +17,7 @@
 require 'Ice'
 require 'Ice/BuiltinSequences.rb'
 
-module Glacier2
+module ::Glacier2
 
     if not defined?(::Glacier2::SSLInfo)
         class SSLInfo

data/lib/Glacier2/Session.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
-# **********************************************************************
 #
-# Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+# Copyright (c) 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.7.1
+# Ice version 3.7.6
 #
 # <auto-generated>
 #
@@ -24,7 +19,7 @@ require 'Ice/BuiltinSequences.rb'
 require 'Ice/Identity.rb'
 require 'Glacier2/SSLInfo.rb'
 
-module Glacier2
+module ::Glacier2
 
     if not defined?(::Glacier2::CannotCreateSessionException)
         class CannotCreateSessionException < Ice::UserException