zeroc-ice 3.7.4 → 3.7.5

data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp

@@ -209,24 +209,21 @@ ASMUtcTimeToTime(const ASN1_UTCTIME* s)
     }
 #  undef g2
 
-    //
-    // If timegm was on all systems this code could be
-    // return IceUtil::Time::seconds(timegm(&tm) - offset*60);
-    //
-    // Windows doesn't support the re-entrant _r versions.
-    //
-#if defined(_MSC_VER)
-#   pragma warning(disable:4996) // localtime is depercated
-#endif
     time_t tzone;
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mut);
         time_t now = time(0);
-        tzone = mktime(localtime(&now)) - mktime(gmtime(&now));
-    }
+        struct tm localTime;
+        struct tm gmTime;
 #if defined(_MSC_VER)
-#   pragma warning(default:4996) // localtime is depercated
+        localtime_s(&localTime, &now);
+        gmtime_s(&gmTime, &now);
+#else
+        localtime_r(&now, &localTime);
+        gmtime_r(&now, &gmTime);
 #endif
+        tzone = mktime(&localTime) - mktime(&gmTime);
+    }
 
     IceUtil::Time time = IceUtil::Time::seconds(mktime(&tm) - IceUtil::Int64(offset) * 60 + tzone);
 

data/ext/ice/cpp/src/IceUtil/Time.cpp

@@ -280,17 +280,15 @@ IceUtil::Time::toString(const std::string& format) const
 {
     time_t time = static_cast<long>(_usec / 1000000);
 
-    struct tm* t;
-#ifdef _WIN32
-    t = localtime(&time);
-#else
     struct tm tr;
+#ifdef _MSC_VER
+    localtime_s(&tr, &time);
+#else
     localtime_r(&time, &tr);
-    t = &tr;
 #endif
 
     char buf[32];
-    if(strftime(buf, sizeof(buf), format.c_str(), t) == 0)
+    if(strftime(buf, sizeof(buf), format.c_str(), &tr) == 0)
     {
         return std::string();
     }

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

@@ -139,7 +139,7 @@ public:
         static const string prefix = "java:";
 
         //
-        // Validate global metadata in the top-level file and all included files.
+        // Validate file metadata in the top-level file and all included files.
         //
         StringList files = p->allFiles();
 
@@ -166,7 +166,7 @@ public:
                     }
                     else
                     {
-                        dc->warning(InvalidMetaData, file, "",  "ignoring invalid global metadata `" + s + "'");
+                        dc->warning(InvalidMetaData, file, "",  "ignoring invalid file metadata `" + s + "'");
                         globalMetaData.remove(s);
                         continue;
                     }
@@ -953,7 +953,7 @@ Slice::JavaCompatGenerator::getPackagePrefix(const ContainedPtr& cont) const
     assert(m);
 
     //
-    // The java:package metadata can be defined as global metadata or applied to a top-level module.
+    // The java:package metadata can be defined as file metadata or applied to a top-level module.
     // We check for the metadata at the top-level module first and then fall back to the global scope.
     //
     static const string prefix = "java:package:";
@@ -3433,7 +3433,7 @@ Slice::JavaGenerator::getPackagePrefix(const ContainedPtr& cont) const
     assert(m);
 
     //
-    // The java:package metadata can be defined as global metadata or applied to a top-level module.
+    // The java:package metadata can be defined as file metadata or applied to a top-level module.
     // We check for the metadata at the top-level module first and then fall back to the global scope.
     //
     static const string prefix = "java:package:";

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

@@ -329,7 +329,7 @@ Slice::DefinitionContext::initSuppressedWarnings()
                 else
                 {
                     warning(InvalidMetaData, "", "", string("invalid category `") + s +
-                            "' in global metadata suppress-warning");
+                            "' in file metadata suppress-warning");
                 }
             }
         }
@@ -2716,7 +2716,7 @@ Slice::Container::mergeModules()
             }
 
             //
-            // Compare the global metadata of the two modules being merged.
+            // Compare the file metadata of the two modules being merged.
             //
             DefinitionContextPtr dc2 = mod2->definitionContext();
             assert(dc2);
@@ -2725,7 +2725,7 @@ Slice::Container::mergeModules()
             metaData2.unique();
             if(!checkGlobalMetaData(metaData1, metaData2))
             {
-                unit()->warning(All, "global metadata mismatch for module `" + mod1->name() + "' in files " +
+                unit()->warning(All, "file metadata mismatch for module `" + mod1->name() + "' in files " +
                                 dc1->filename() + " and " + dc2->filename());
             }
 
@@ -3065,7 +3065,7 @@ bool
 Slice::Container::checkGlobalMetaData(const StringList& m1, const StringList& m2)
 {
     //
-    // Not all global metadata mismatches represent actual problems. We are only concerned about
+    // Not all file metadata mismatches represent actual problems. We are only concerned about
     // the prefixes listed below (also see bug 2766).
     //
     static const char* prefixes[] =
@@ -6546,12 +6546,12 @@ Slice::Unit::addGlobalMetaData(const StringList& metaData)
     assert(dc);
     if(dc->seenDefinition())
     {
-        error("global metadata must appear before any definitions");
+        error("file metadata must appear before any definitions");
     }
     else
     {
         //
-        // Append the global metadata to any existing metadata (e.g., default global metadata).
+        // Append the file metadata to any existing metadata (e.g., default file metadata).
         //
         StringList l = dc->getMetaData();
         copy(metaData.begin(), metaData.end(), back_inserter(l));

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

@@ -685,7 +685,7 @@ Slice::Python::compile(const vector<string>& argv)
                         }
 
                         //
-                        // Check if the file contains the python:pkgdir global metadata.
+                        // Check if the file contains the python:pkgdir file metadata.
                         //
                         const string pkgdir = getPackageDirectory(icecpp->getFileName(), u);
 

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

@@ -2852,7 +2852,7 @@ Slice::Python::getPackageDirectory(const string& file, const UnitPtr& ut)
     //
 
     //
-    // Check if the file contains the python:pkgdir global metadata.
+    // Check if the file contains the python:pkgdir file metadata.
     //
     DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
@@ -2877,7 +2877,7 @@ Slice::Python::getImportFileName(const string& file, const UnitPtr& ut, const ve
     //
 
     //
-    // Check if the file contains the python:pkgdir global metadata.
+    // Check if the file contains the python:pkgdir file metadata.
     //
     string pkgdir = getPackageDirectory(file, ut);
     if(!pkgdir.empty())
@@ -3034,7 +3034,7 @@ Slice::Python::getPackageMetadata(const ContainedPtr& cont)
     assert(m);
 
     //
-    // The python:package metadata can be defined as global metadata or applied to a top-level module.
+    // The python:package metadata can be defined as file metadata or applied to a top-level module.
     // We check for the metadata at the top-level module first and then fall back to the global scope.
     //
     static const string prefix = "python:package:";
@@ -3101,7 +3101,7 @@ Slice::Python::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
     static const string prefix = "python:";
 
     //
-    // Validate global metadata in the top-level file and all included files.
+    // Validate file metadata in the top-level file and all included files.
     //
     StringList files = p->allFiles();
     for(StringList::iterator q = files.begin(); q != files.end(); ++q)
@@ -3126,7 +3126,7 @@ Slice::Python::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
                     continue;
                 }
 
-                dc->warning(InvalidMetaData, file, "", "ignoring invalid global metadata `" + s + "'");
+                dc->warning(InvalidMetaData, file, "", "ignoring invalid file metadata `" + s + "'");
                 globalMetaData.remove(s);
             }
         }

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

@@ -2524,7 +2524,7 @@ int checkIdentifier(string& id)
     {
         DefinitionContextPtr dc = unit->currentDefinitionContext();
         assert(dc);
-        if(dc->findMetaData("underscore") != "underscore") // no 'underscore' global metadata
+        if(dc->findMetaData("underscore") != "underscore") // no 'underscore' file metadata
         {
             unit->error("illegal underscore in identifier `" + name + "'");
         }

data/ice.gemspec

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

data/lib/Glacier2/Metrics.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifier.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Glacier2/Router.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Glacier2/RouterF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Glacier2/SSLInfo.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Glacier2/Session.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/BuiltinSequences.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/Communicator.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/CommunicatorF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/Connection.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/ConnectionF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/Current.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/Endpoint.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/EndpointF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/EndpointTypes.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/FacetMap.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/Identity.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/ImplicitContext.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/ImplicitContextF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/Instrumentation.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/InstrumentationF.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/LocalException.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #

data/lib/Ice/Locator.rb

@@ -3,7 +3,7 @@
 # Copyright (c) ZeroC, Inc. All rights reserved.
 #
 #
-# Ice version 3.7.4
+# Ice version 3.7.5
 #
 # <auto-generated>
 #