Merge remote-tracking branch 'origin/3.6'

Conflicts:
	README.md
	android/build.gradle
	android/gradle.properties
	android/gradle/wrapper/gradle-wrapper.properties
	config/Make.common.rules
	config/PropertyNames.xml
	cpp/BuildInstructionsLinux.md
	cpp/BuildInstructionsOSX.md
	cpp/BuildInstructionsWinRT.md
	cpp/BuildInstructionsWindows.md
	cpp/config/Make.rules
	cpp/config/Make.rules.mak
	cpp/include/IceUtil/Config.h
	cpp/include/Slice/PythonUtil.h
	cpp/include/Slice/RubyUtil.h
	cpp/include/Slice/Util.h
	cpp/src/Ice/DynamicLibrary.cpp
	cpp/src/Ice/PropertyNames.cpp
	cpp/src/Ice/PropertyNames.h
	cpp/src/Ice/winrt/StreamEndpointI.cpp
	cpp/src/IceGrid/IceGridDB.cpp
	cpp/src/IceGrid/Util.cpp
	cpp/src/IceUtil/FileUtil.cpp
	cpp/src/IceUtil/FileUtil.h
	cpp/src/Makefile
	cpp/src/Slice/Util.cpp
	cpp/src/slice2cs/Gen.cpp
	cpp/src/slice2freeze/Main.cpp
	cpp/src/slice2freezej/Main.cpp
	cpp/src/slice2html/Makefile
	cpp/src/slice2html/Makefile.mak
	cpp/src/slice2java/Main.cpp
	cpp/test/Ice/exceptions/AllTests.cpp
	cpp/test/Ice/facets/AllTests.cpp
	cpp/test/Ice/info/AllTests.cpp
	cpp/test/Ice/location/AllTests.cpp
	cpp/test/Ice/properties/run.py
	cpp/test/Ice/timeout/AllTests.cpp
	cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
	cpp/test/IceStorm/stress/run.py
	cpp/test/TestSuite/10.0/Package.appxmanifest
	cpp/test/TestSuite/10.0/TestSuite.vcxproj
	cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters
	cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx
	cpp/test/TestSuite/8.0/TestSuite.vcxproj
	cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx
	csharp/BuildInstructions.md
	csharp/src/Ice/PropertyNames.cs
	csharp/src/IceLocatorDiscovery/PluginI.cs
	java/BuildInstructions.md
	java/Makefile
	java/Makefile.mak
	java/src/Glacier2/src/main/java/Glacier2/Application.java
	java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
	java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
	java/src/Ice/src/main/java/Ice/Object.java
	java/src/Ice/src/main/java/Ice/ObjectImpl.java
	java/src/Ice/src/main/java/IceInternal/PropertyNames.java
	java/src/Ice/src/main/java/IceSSL/Plugin.java
	java/src/Ice/src/main/java/IceSSL/PluginFactory.java
	java/src/Ice/src/main/java/IceUtil/Cache.java
	java/src/IceGridGUI/build.gradle
	java/src/IceGridGUI/src/main/java/IceGridGUI/SimpleInternalFrame.java
	java/src/IceGridGUI/src/main/java/IceGridGUI/Utils.java
	java/test/build.gradle
	java/test/ejb/README.md
	js/src/Ice/PropertyNames.js
	js/src/Ice/browser/TimerUtil.js
	js/src/Ice/browser/WSTransceiver.js
	js/test/Common/TestCases.json
	js/test/Common/Worker.js
	objective-c/include/objc/Ice/Config.h
	objective-c/src/Ice/CommunicatorI.mm
	php/BuildInstructionsLinuxOSX.md
	php/BuildInstructionsWindows.md
	php/config/Make.rules.mak.php
	php/src/php7/IcePHP.rc
	python/BuildInstructionsLinuxOSX.md
	python/BuildInstructionsWindows.md
	python/Makefile
	python/modules/IcePy/Slice.cpp
	python/test/Slice/import/run.py
	ruby/BuildInstructionsLinuxOSX.md
	ruby/BuildInstructionsWindows.md
	ruby/config/Make.rules
	ruby/src/IceRuby/Slice.cpp
	scripts/TestController.py
	scripts/TestUtil.py
	slice/Ice/Communicator.ice
	slice/Ice/Instrumentation.ice
	slice/IceLocatorDiscovery/IceLocatorDiscovery.ice

1 files changed, 10 insertions, 17 deletions

diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp
index 4343456efb2..73a470260c4 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/Slice/Python.cpp
@@ -187,10 +187,8 @@ PackageVisitor::visitModuleEnd(const ModulePtr& p)
 void
 PackageVisitor::createDirectory(const string& dir)
 {
-    struct stat st;
-    int result;
-    result = stat(dir.c_str(), &st);
-    if(result == 0)
+    IceUtilInternal::structstat st;
+    if(!IceUtilInternal::stat(dir, &st))
     {
         if(!(st.st_mode & S_IFDIR))
         {
@@ -201,13 +199,8 @@ PackageVisitor::createDirectory(const string& dir)
         }
         return;
     }
-#ifdef _WIN32
-    result = _mkdir(dir.c_str());
-#else
-    result = mkdir(dir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
 
-    if(result != 0)
+    if(IceUtilInternal::mkdir(dir, 0777) != 0)
     {
         ostringstream os;
         os << "cannot create directory `" << dir << "': " << strerror(errno);
@@ -254,10 +247,10 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
 {
     string initPath = dir + "/__init__.py";
 
-    struct stat st;
-    if(stat(initPath.c_str(), &st) == 0)
+    IceUtilInternal::structstat st;
+    if(!IceUtilInternal::stat(initPath, &st))
     {
-        ifstream in(initPath.c_str());
+        ifstream in(IceUtilInternal::streamFilename(initPath).c_str());
         if(!in)
         {
             ostringstream os;
@@ -358,7 +351,7 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
 {
     string initPath = dir + "/__init__.py";
 
-    ofstream os(initPath.c_str());
+    ofstream os(IceUtilInternal::streamFilename(initPath).c_str());
     if(!os)
     {
         ostringstream os;
@@ -388,7 +381,7 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
 }
 
 void
-usage(const char* n)
+usage(const string& n)
 {
     getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
     getErrorStream() <<
@@ -416,7 +409,7 @@ usage(const char* n)
 }
 
 int
-Slice::Python::compile(int argc, char* argv[])
+Slice::Python::compile(const vector<string>& argv)
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -441,7 +434,7 @@ Slice::Python::compile(int argc, char* argv[])
     vector<string> args;
     try
     {
-        args = opts.parse(argc, const_cast<const char**>(argv));
+        args = opts.parse(argv);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {