zeroc-ice 3.6.1 → 3.6.2

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

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

@@ -13,6 +13,10 @@ MACHINE = $(shell uname -m)
 
 LIBDIR = lib
 
+ifeq ($(UNAME),Darwin)
+	CFLAGS += -mmacosx-version-min=10.9
+endif
+
 ifeq ($(UNAME),Linux)
     CFLAGS += -fPIC
 
@@ -47,7 +51,7 @@ endif
 #
 ifneq ($(findstring MINGW,$(UNAME)),)
     CC = gcc
-endif 
+endif
 
 OBJS = directive.o eval.o expand.o main.o mbchar.o support.o system.o
 
@@ -67,4 +71,3 @@ endif
 clean:
 	rm -f $(OBJS)
 	rm -rf $(LIBDIR)
-

data/ext/ice/mcpp/README.md

@@ -25,6 +25,12 @@ This creates a static library `libmcpp.a`. Depending on your platform, the libra
 
 Open a Visual Studio Command Prompt, and type:
 ```
-  nmake -f Makefile.mak
+  MSbuild msbuild\mcpp.vcxproj
+```
+This will create a static library `mcpp.lib` for Release configurations and `mcppd.lib` for Debug configurations,
+to build a different platform set the MSbuild Platform property likewise to build a different configuration set
+the MSbuild Configuration property.
+
+```
+  MSbuild msbuild\mcpp.vcxproj /p:Configuration=Release /p:Platform=X64
 ```
-This creates two static libraries: `mcpp.lib`, built with `/MD` ("release") and `mcppd.lib`, built with `/MDd` ("debug").

data/ext/ice/mcpp/configed.H

@@ -129,6 +129,15 @@
 #define CURRENT             1
 #define SOURCE              2
 
+/* Default MBCHAR (multi-byte character) encoding.  */
+#define EUC_JP          0x10    /* Extended UNIX code of JIS X 0208 */
+#define GB2312          0x20    /* EUC-like encoding of Chinese GB 2312-80  */
+#define KSC5601         0x30    /* EUC-like encoding of Korean KS C 5601    */
+#define SJIS            0x80    /* Shift-JIS encoding of JIS X 0208 */
+#define BIGFIVE         0x90    /* Encoding of Taiwanese Big Five   */
+#define ISO2022_JP      0x100   /* ISO-2022-JP (ISO-2022-JP1) encoding      */
+#define UTF8            0x1000  /* UTF-8 encoding           */
+
 #define MBCHAR              UTF8
 
 #if     COMPILER == INDEPENDENT
@@ -234,4 +243,3 @@
 #if     KMMALLOC && _MEM_DEBUG
 #include        "xalloc.h"
 #endif
-

data/ext/ice/mcpp/support.c

@@ -597,6 +597,7 @@ char *  scan_quote(
     const char * const      empty_const
                         = "Empty character constant %s%.0ld%s";
     const char *    skip;
+    size_t      len;
     int         c;
     char *      out_p = out;
 
@@ -654,6 +655,7 @@ char *  scan_quote(
             "Illegal control character %.0s0lx%02x in quotation"    /* _W1_ */
                     , NULL, (long) c, NULL);
         *out_p++ = c;
+chk_limit:
         if (out_end < out_p) {
             *out_end = EOS;
             cfatal( "Too long quotation", NULL, 0L, NULL);  /* _F_  */
@@ -1289,7 +1291,7 @@ static char *   get_line(
 /*
  * ANSI (ISO) C: translation phase 1, 2.
  * Get the next logical line from source file.
- * Convert [CR+LF] to [LF]. 
+ * Convert [CR+LF] to [LF].
  */
 {
 #define cr_warn_level 1
@@ -1981,4 +1983,3 @@ static void dump_token(
     mcpp_fputs( "token", DBG);
     dump_string( t_type[ token_type - NAM], cp);
 }
-

data/ice.gemspec

@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.
@@ -9,7 +9,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
-  s.version     = '3.6.1'
+  s.version     = '3.6.2'
   s.summary     = "ZeroC Ice for Ruby"
   s.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven

data/lib/Glacier2.rb

@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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/lib/Glacier2/Metrics.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifier.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Glacier2/Router.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Glacier2/RouterF.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Glacier2/SSLInfo.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Glacier2/Session.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice.rb

@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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/lib/Ice/BuiltinSequences.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/Communicator.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/CommunicatorF.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/Connection.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/ConnectionF.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/Current.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/Endpoint.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/EndpointF.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/EndpointTypes.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/FacetMap.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #

data/lib/Ice/Identity.rb

@@ -1,13 +1,14 @@
+# encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2016 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.6.1
+# Ice version 3.6.2
 #
 # <auto-generated>
 #