zeroc-ice 3.6.2 → 3.6.3

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

@@ -56,10 +56,10 @@ interruptedCallback(int /*signal*/)
 }
 
 void
-usage(const char* n)
+usage(const string& n)
 {
     getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
-    getErrorStream() <<        
+    getErrorStream() <<
         "Options:\n"
         "-h, --help           Show this message.\n"
         "-v, --version        Display the Ice version.\n"
@@ -83,7 +83,7 @@ usage(const char* n)
 }
 
 int
-Slice::Ruby::compile(int argc, char* argv[])
+Slice::Ruby::compile(const vector<string>& argv)
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -101,11 +101,11 @@ Slice::Ruby::compile(int argc, char* argv[])
     opts.addOpt("", "underscore");
     opts.addOpt("", "all");
     opts.addOpt("", "checksum");
-     
+
     vector<string> args;
     try
     {
-        args = opts.parse(argc, const_cast<const char**>(argv));
+        args = opts.parse(argv);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
@@ -222,7 +222,7 @@ Slice::Ruby::compile(int argc, char* argv[])
                 return EXIT_FAILURE;
             }
 
-            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::Ruby : Preprocessor::SliceXML, includePaths, 
+            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::Ruby : Preprocessor::SliceXML, includePaths,
                                                   "-D__SLICE2RB__"))
             {
                 out.cleanup();

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

@@ -245,17 +245,7 @@ Slice::Ruby::CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         //
         ClassList allBases = p->allBases();
         StringList ids;
-#if defined(__IBMCPP__) && defined(NDEBUG)
-//
-// VisualAge C++ 6.0 does not see that ClassDef is a Contained,
-// when inlining is on. The code below issues a warning: better
-// than an error!
-//
-        transform(allBases.begin(), allBases.end(), back_inserter(ids),
-                  IceUtil::constMemFun<string,ClassDef>(&Contained::scoped));
-#else
         transform(allBases.begin(), allBases.end(), back_inserter(ids), IceUtil::constMemFun(&Contained::scoped));
-#endif
         StringList other;
         other.push_back(scoped);
         other.push_back("::Ice::Object");

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

@@ -10,6 +10,7 @@
 #include <Slice/Util.h>
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/StringUtil.h>
+#include <IceUtil/StringConverter.h>
 #include <climits>
 
 #ifndef _MSC_VER
@@ -172,11 +173,11 @@ Slice::changeInclude(const string& path, const vector<string>& includePaths)
     {
         paths.push_back(canonicalPath);
     }
-    
+
     for(vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i)
     {
         for(vector<string>::const_iterator j = includePaths.begin(); j != includePaths.end(); ++j)
-        {            
+        {
             if(i->compare(0, j->length(), *j) == 0)
             {
                 string s = i->substr(j->length() + 1); // + 1 for the '/'
@@ -186,7 +187,7 @@ Slice::changeInclude(const string& path, const vector<string>& includePaths)
                 }
             }
         }
-        
+
         //
         // If the path has been already shortened no need to test
         // with canonical path.
@@ -430,3 +431,27 @@ Slice::DependOutputUtil::os()
 {
     return _file.empty() ? cout : _os;
 }
+
+#ifdef _WIN32
+vector<string>
+Slice::argvToArgs(int argc, wchar_t* argv[])
+{
+    vector<string> args;
+    for(int i = 0; i < argc; i++)
+    {
+        args.push_back(IceUtil::wstringToString(argv[i]));
+    }
+    return args;
+}
+#else
+vector<string>
+Slice::argvToArgs(int argc, char* argv[])
+{
+    vector<string> args;
+    for(int i = 0; i < argc; i++)
+    {
+        args.push_back(argv[i]);
+    }
+    return args;
+}
+#endif

data/ext/ice/mcpp/Makefile

@@ -4,7 +4,7 @@
 #
 # **********************************************************************
 
-PREFIX		= /opt/mcpp-2.7.2
+PREFIX ?= /opt/mcpp-2.7.2
 
 CFLAGS += -O -w
 
@@ -18,9 +18,9 @@ ifeq ($(UNAME),Darwin)
 endif
 
 ifeq ($(UNAME),Linux)
-    CFLAGS += -fPIC
+	CFLAGS += -fPIC
 
-    ifeq ($(MACHINE),i686)
+	ifeq ($(MACHINE),i686)
 	CFLAGS += -m32
 
 	#
@@ -29,7 +29,7 @@ ifeq ($(UNAME),Linux)
 	ifeq ($(shell test -d /usr/lib/i386-linux-gnu && echo 0),0)
 		LIBDIR = lib/i386-linux-gnu
 	endif
-    else
+	else
 	#
 	# Ubuntu.
 	#
@@ -43,14 +43,18 @@ ifeq ($(UNAME),Linux)
 	ifeq ($(shell test -d /usr/lib64 && echo 0),0)
 		LIBDIR = lib64
 	endif
-    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 ?= gcc
 endif
 
 OBJS = directive.o eval.o expand.o main.o mbchar.o support.o system.o

data/ext/ice/mcpp/configed.H

@@ -193,6 +193,9 @@
 #define _POSIX_C_SOURCE_defined     1
 #endif
 #include    "limits.h"
+#ifdef _AIX
+#include    "sys/stat.h"
+#endif
 #undef  _POSIX_
 #undef  _POSIX_SOURCE
 #ifdef  _POSIX_C_SOURCE_defined

data/ext/ice/mcpp/main.c

@@ -307,7 +307,7 @@ int     mcpp_lib_main
 
     /* Open input file, "-" means stdin.    */
     if (in_file != NULL && ! str_eq( in_file, "-")) {
-        if ((fp_in = fopen( in_file, "r")) == NULL) {
+        if ((fp_in = mcpp_fopen( in_file, "r")) == NULL) {
             mcpp_fprintf( ERR, "Can't open input file \"%s\".\n", in_file);
             errors++;
             goto  fatal_error_exit;
@@ -317,7 +317,7 @@ int     mcpp_lib_main
     }
     /* Open output file, "-" means stdout.  */
     if (out_file != NULL && ! str_eq( out_file, "-")) {
-        if ((fp_out = fopen( out_file, "w")) == NULL) {
+        if ((fp_out = mcpp_fopen( out_file, "w")) == NULL) {
             mcpp_fprintf( ERR, "Can't open output file \"%s\".\n", out_file);
             errors++;
             goto  fatal_error_exit;

data/ext/ice/mcpp/mcpp.gyp

@@ -55,6 +55,12 @@
             '-fPIC',
             '-w'
           ]
+        }],
+        ['OS=="win"', {
+          'defines' : [
+              '_WIN32_WINNT=0x600',
+              'WIN32_LEAN_AND_MEAN'
+          ]
         }]
       ]
     }

data/ext/ice/mcpp/support.c

@@ -1033,7 +1033,7 @@ int     get_ch( void)
         cur_fullname = infile->full_fname;
         cur_fname = infile->real_fname;     /* Restore current fname*/
         if (infile->pos != 0L) {            /* Includer was closed  */
-            infile->fp = fopen( cur_fullname, "r");
+            infile->fp = mcpp_fopen( cur_fullname, "r");
             fseek( infile->fp, infile->pos, SEEK_SET);
         }   /* Re-open the includer and restore the file-position   */
         len = (int) (infile->bptr - infile->buffer);

data/ext/ice/mcpp/system.H

@@ -70,7 +70,7 @@
  */
 
 /*
- * The variable 'mcpp_mode' specifies the mode of preprocessing as one of 
+ * The variable 'mcpp_mode' specifies the mode of preprocessing as one of
  *          OLD_PREP, KR, STD, or POST_STD.
  *      Those modes have many differences each other --
  *          i.e. handling of translation phases; handling of some
@@ -371,3 +371,8 @@ typedef long            expr_t;
  */
 #define CPLUS               1       /* 199711L for C++ Standard     */
 
+
+//
+// helper methods to open files using UNICODE paths
+//
+FILE* mcpp_fopen(const char *filename, const char *mode);

data/ext/ice/mcpp/system.c

@@ -36,6 +36,7 @@
  *      1. specify the constants in "configed.H" or "noconfig.H",
  *      2. append the system-dependent routines in this file.
  */
+
 #include    "system.H"
 #include    "internal.H"
 
@@ -414,9 +415,9 @@ opt_search: ;
         set_sys_dirs( set_cplus_dir);
 
     if (mkdep_mf) {                         /* -MF overrides -MD    */
-        mkdep_fp = fopen( mkdep_mf, "w");
+        mkdep_fp = mcpp_fopen( mkdep_mf, "w");
     } else if (mkdep_md) {
-        mkdep_fp = fopen( mkdep_md, "w");
+        mkdep_fp = mcpp_fopen( mkdep_md, "w");
     }
     if (mkdep_mq)                           /* -MQ overrides -MT    */
         mkdep_target = mkdep_mq;
@@ -580,7 +581,7 @@ static void def_a_macro(
     skip_nl();                      /* Clear the appended <newline> */
 }
 
-static void     chk_opts( 
+static void     chk_opts(
     int     sflag,      /* Flag of Standard or post-Standard mode   */
     int     trad                    /* -traditional (GCC only)      */
 )
@@ -835,7 +836,7 @@ static void set_sys_dirs(
     set_a_dir( "/usr/local/include");
 #endif
 
-#ifdef  C_INCLUDE_DIR1 
+#ifdef  C_INCLUDE_DIR1
     set_a_dir( C_INCLUDE_DIR1);
 #endif
 #ifdef  C_INCLUDE_DIR2
@@ -882,7 +883,7 @@ static void set_a_dir(
         incdir = (const char **) xrealloc( (void *) incdir
                 , sizeof (char *) * max_inc * 2);
         incend = &incdir[ max_inc];
-        max_inc *= 2;                   
+        max_inc *= 2;
     }
 
     if (dirname == NULL)
@@ -1140,7 +1141,7 @@ static char *   norm_path(
             } else {                                /* Impossible   */
                 break;
             }
-        } else {                                    /* Impossible   */ 
+        } else {                                    /* Impossible   */
             break;
         }
     }
@@ -1348,7 +1349,7 @@ void    put_depend(
 }
 
 static char *   md_init(
-    const char *    filename,   /* The source file name             */ 
+    const char *    filename,   /* The source file name             */
     char *  output              /* Output to dependency file        */
 )
 /*
@@ -1379,7 +1380,7 @@ static char *   md_init(
     if (! mkdep_fp) {   /* Unless already opened by -MF, -MD, -MMD options  */
         if (mkdep & MD_FILE) {
             strcpy( cp, "d");
-            mkdep_fp = fopen( prefix, "w");
+            mkdep_fp = mcpp_fopen(prefix, "w");
         } else {
             mkdep_fp = fp_out;  /* Output dependency line to normal output  */
             no_output++;                /* Without normal output    */
@@ -1617,7 +1618,7 @@ static int  has_directory(
 )
 /*
  * If a directory is found in the 'source' filename string (i.e. "includer"),
- * the directory part of the string is copied to 'directory' and 
+ * the directory part of the string is copied to 'directory' and
  * has_directory() returns TRUE.
  * Else, nothing is copied and it returns FALSE.
  */
@@ -1734,10 +1735,10 @@ static int  open_file(
         return  FALSE;
     if (included( fullname))        /* Once included    */
         goto  true;
-        
+
     if ((max_open != 0 && max_open <= include_nest)
                             /* Exceed the known limit of open files */
-            || ((fp = fopen( fullname, "r")) == NULL && errno == EMFILE)) {
+            || ((fp = mcpp_fopen( fullname, "r")) == NULL && errno == EMFILE)) {
                             /* Reached the limit for the first time */
         if (mcpp_debug & PATH) {
 #if HOST_COMPILER == BORLANDC
@@ -1757,14 +1758,14 @@ static int  open_file(
         file->pos = ftell( file->fp);
         fclose( file->fp);
         /* In case of failure, re-open the includer */
-        if ((fp = fopen( fullname, "r")) == NULL) {
-            file->fp = fopen( cur_fullname, "r");
+        if ((fp = mcpp_fopen( fullname, "r")) == NULL) {
+            file->fp = mcpp_fopen( cur_fullname, "r");
             fseek( file->fp, file->pos, SEEK_SET);
             goto  false;
         }
         if (max_open == 0)      /* Remember the limit of the system */
             max_open = include_nest;
-    } else if (fp == NULL)                  /* No read permission   */ 
+    } else if (fp == NULL)                  /* No read permission   */
         goto  false;
     /* Truncate buffer of the includer to save memory   */
     len = (int) (file->bptr - file->buffer);
@@ -1821,7 +1822,7 @@ void    add_file(
     FILEINFO *      file;
     const char *    too_many_include_nest =
             "More than %.0s%ld nesting of #include";    /* _F_ _W4_ */
-            
+
     //
     // When encoding is UTF-8, skip BOM if present.
     //
@@ -2698,3 +2699,39 @@ void    clear_filelist( void)
     free( (void *) fnamelist);
     free( (void *) once_list);
 }
+
+#ifdef _WIN32
+#  include <Windows.h>
+#endif
+
+FILE* mcpp_fopen(const char* filename, const char* mode)
+{
+#ifdef _WIN32
+    FILE* f = 0;
+    if(filename && mode)
+    {
+        int wfilenameLength = strlen(filename) + 1;
+        wchar_t* wfilename = malloc(wfilenameLength * sizeof(wchar_t));
+        if(wfilename)
+        {
+            if(MultiByteToWideChar(CP_UTF8, 0, filename, -1, wfilename, wfilenameLength))
+            {
+                int wmodeLength = strlen(mode) + 1;
+                wchar_t* wmode = malloc(wmodeLength * sizeof(wchar_t));
+                if(wmode)
+                {
+                    if(MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, wmodeLength))
+                    {
+                        _wfopen_s(&f, wfilename, wmode);
+                    }
+                    free(wmode);
+                }
+            }
+            free(wfilename);
+        }
+    }
+    return f;
+#else
+    return fopen(filename, mode);
+#endif
+}

data/ice.gemspec

@@ -9,7 +9,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
-  s.version     = '3.6.2'
+  s.version     = '3.6.3'
   s.summary     = "ZeroC Ice for Ruby"
   s.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven

data/lib/Glacier2/Metrics.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifier.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #

data/lib/Glacier2/Router.rb

@@ -8,7 +8,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.2
+# Ice version 3.6.3
 #
 # <auto-generated>
 #