Merge remote-tracking branch 'origin/main' into x-js-optionals

zeroc-ice · Jun 26, 2024 · 691e67b · 691e67b
2 parents f81a80e + b3fa58c
commit 691e67b
Show file tree

Hide file tree

Showing 207 changed files with 1,095 additions and 1,162 deletions.
diff --git a/cpp/doxygen/examples/Ice/SSL/SecureTransportClientAuthenticationOptions.cpp b/cpp/doxygen/examples/Ice/SSL/SecureTransportClientAuthenticationOptions.cpp
@@ -4,7 +4,7 @@
 
 #include <Ice/Ice.h>
 // Disable deprecation warnings from SecureTransport APIs
-#include "../../src/IceUtil/DisableWarnings.h"
+#include "../../src/Ice/DisableWarnings.h"
 
 #if defined(ICE_USE_SECURE_TRANSPORT)
 

diff --git a/cpp/doxygen/examples/Ice/SSL/SecureTransportServerAuthenticationOptions.cpp b/cpp/doxygen/examples/Ice/SSL/SecureTransportServerAuthenticationOptions.cpp
@@ -4,7 +4,7 @@
 
 #include <Ice/Ice.h>
 // Disable deprecation warnings from SecureTransport APIs
-#include "../../src/IceUtil/DisableWarnings.h"
+#include "../../src/Ice/DisableWarnings.h"
 
 #if defined(ICE_USE_SECURE_TRANSPORT)
 void

diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#include "../IceUtil/ConsoleUtil.h"
-#include "../IceUtil/Options.h"
+#include "../Ice/ConsoleUtil.h"
+#include "../Ice/Options.h"
 #include "Glacier2/NullPermissionsVerifier.h"
 #include "Glacier2/Session.h"
 #include "Ice/Ice.h"
@@ -15,7 +15,6 @@ using namespace std;
 using namespace Ice;
 using namespace Glacier2;
 using namespace IceInternal;
-using namespace IceUtilInternal;
 
 namespace
 {
@@ -92,7 +91,7 @@ RouterService::start(int argc, char* argv[], int& status)
 {
     bool nowarn;
 
-    IceUtilInternal::Options opts;
+    IceInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
     opts.addOpt("", "nowarn");
@@ -102,7 +101,7 @@ RouterService::start(int argc, char* argv[], int& status)
     {
         args = opts.parse(argc, argv);
     }
-    catch (const IceUtilInternal::BadOptException& e)
+    catch (const IceInternal::BadOptException& e)
     {
         error(e.reason);
         usage(argv[0]);

diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc
@@ -1,4 +1,4 @@
-#include "../IceUtil/ResourceConfig.h"
+#include "../Ice/ResourceConfig.h"
 
 #define ICE_INTERNALNAME "glacier2router\0"
 #define ICE_ORIGINALFILENAME "glacier2router.exe\0"

diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "ProxyVerifier.h"
-#include "../IceUtil/ConsoleUtil.h"
+#include "../Ice/ConsoleUtil.h"
 
 #include <stdexcept>
 #include <string>
@@ -12,7 +12,6 @@
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
-using namespace IceUtilInternal;
 
 //
 // TODO: Some of the address matching helper classes can probably be

diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifier.rc
@@ -1,4 +1,4 @@
-#include "../IceUtil/ResourceConfig.h"
+#include "../Ice/ResourceConfig.h"
 
 #define ICE_INTERNALNAME ICE_LIBNAME("glacier2cryptpermissionsverifier") "\0"
 #define ICE_ORIGINALFILENAME ICE_LIBNAME("glacier2cryptpermissionsverifier") ".dll\0"

diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp b/cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
@@ -5,7 +5,7 @@
 #include "Glacier2/PermissionsVerifier.h"
 #include "Ice/Ice.h"
 
-#include "../IceUtil/FileUtil.h"
+#include "../Ice/FileUtil.h"
 #include "Ice/StringUtil.h"
 
 #include <fstream>
@@ -25,7 +25,7 @@
 #endif
 
 // Disable deprecation warnings from CommonCrypto APIs
-#include "../IceUtil/DisableWarnings.h"
+#include "../Ice/DisableWarnings.h"
 
 using namespace std;
 using namespace Ice;
@@ -68,7 +68,7 @@ namespace
 
     map<string, string> retrievePasswordMap(const string& file)
     {
-        ifstream passwordFile(IceUtilInternal::streamFilename(file).c_str());
+        ifstream passwordFile(IceInternal::streamFilename(file).c_str());
         if (!passwordFile)
         {
             string err = IceInternal::lastErrorToString();

diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc
@@ -1,4 +1,4 @@
-#include "../IceUtil/ResourceConfig.h"
+#include "../Ice/ResourceConfig.h"
 
 #define ICE_INTERNALNAME ICE_LIBNAME("glacier2") "\0"
 #define ICE_ORIGINALFILENAME ICE_LIBNAME("glacier2") ".dll\0"

diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "ConnectionFactory.h"
-#include "../IceUtil/Random.h"
 #include "Acceptor.h"
 #include "CommunicatorFlushBatchAsync.h"
 #include "ConnectionI.h"
@@ -16,6 +15,7 @@
 #include "Ice/Properties.h"
 #include "Instance.h"
 #include "ObjectAdapterI.h" // For getThreadPool().
+#include "Random.h"
 #include "Reference.h"
 #include "RouterInfo.h"
 #include "ThreadPool.h"

diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
@@ -3,10 +3,10 @@
 //
 
 #include "ConnectionI.h"
-#include "../IceUtil/DisableWarnings.h"
 #include "BatchRequestQueue.h"
 #include "CheckIdentity.h"
 #include "DefaultsAndOverrides.h"
+#include "DisableWarnings.h"
 #include "Endian.h"
 #include "EndpointI.h"
 #include "Ice/IncomingRequest.h"

diff --git a/cpp/src/IceUtil/ConsoleUtil.cpp → cpp/src/Ice/ConsoleUtil.cpp b/cpp/src/IceUtil/ConsoleUtil.cpp → cpp/src/Ice/ConsoleUtil.cpp
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <mutex>
 
-using namespace IceUtilInternal;
+using namespace IceInternal;
 using namespace std;
 
 #if defined(_WIN32)
@@ -24,7 +24,7 @@ namespace
 }
 
 const ConsoleUtil&
-IceUtilInternal::getConsoleUtil()
+IceInternal::getConsoleUtil()
 {
     lock_guard sync(consoleMutex);
     if (consoleUtil == 0)
@@ -34,8 +34,8 @@ IceUtilInternal::getConsoleUtil()
     return *consoleUtil;
 }
 
-ConsoleOut IceUtilInternal::consoleOut;
-ConsoleErr IceUtilInternal::consoleErr;
+ConsoleOut IceInternal::consoleOut;
+ConsoleErr IceInternal::consoleErr;
 
 ConsoleUtil::ConsoleUtil()
     : _converter(Ice::getProcessStringConverter()),
@@ -91,15 +91,15 @@ ConsoleUtil::error(const string& message) const
 }
 
 ConsoleOut&
-IceUtilInternal::endl(ConsoleOut& out)
+IceInternal::endl(ConsoleOut& out)
 {
     fprintf_s(stdout, "\n");
     fflush(stdout);
     return out;
 }
 
 ConsoleOut&
-IceUtilInternal::flush(ConsoleOut& out)
+IceInternal::flush(ConsoleOut& out)
 {
     fflush(stdout);
     return out;
@@ -113,15 +113,15 @@ ConsoleOut::operator<<(ConsoleOut& (*pf)(ConsoleOut&))
 }
 
 ConsoleErr&
-IceUtilInternal::endl(ConsoleErr& err)
+IceInternal::endl(ConsoleErr& err)
 {
     fprintf_s(stderr, "\n");
     fflush(stderr);
     return err;
 }
 
 ConsoleErr&
-IceUtilInternal::flush(ConsoleErr& err)
+IceInternal::flush(ConsoleErr& err)
 {
     fflush(stderr);
     return err;
@@ -134,6 +134,6 @@ ConsoleErr::operator<<(ConsoleErr& (*pf)(ConsoleErr&))
     return *this;
 }
 #else
-std::ostream& IceUtilInternal::consoleOut = cout;
-std::ostream& IceUtilInternal::consoleErr = cerr;
+std::ostream& IceInternal::consoleOut = cout;
+std::ostream& IceInternal::consoleErr = cerr;
 #endif
diff --git a/cpp/src/IceUtil/ConsoleUtil.h → cpp/src/Ice/ConsoleUtil.h b/cpp/src/IceUtil/ConsoleUtil.h → cpp/src/Ice/ConsoleUtil.h
@@ -2,16 +2,16 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_UTIL_CONSOLE_UTIL_H
-#define ICE_UTIL_CONSOLE_UTIL_H
+#ifndef ICE_CONSOLE_UTIL_H
+#define ICE_CONSOLE_UTIL_H
 
 #include "Ice/Config.h"
 #include "Ice/StringConverter.h"
 
 #include <ostream>
 #include <sstream>
 
-namespace IceUtilInternal
+namespace IceInternal
 {
 #if defined(_WIN32)
 

diff --git a/cpp/src/IceUtil/DisableWarnings.h → cpp/src/Ice/DisableWarnings.h b/cpp/src/IceUtil/DisableWarnings.h → cpp/src/Ice/DisableWarnings.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_UTIL_DISABLEWARNINGS_H
-#define ICE_UTIL_DISABLEWARNINGS_H
+#ifndef ICE_DISABLEWARNINGS_H
+#define ICE_DISABLEWARNINGS_H
 
 //
 // This header file disables various compiler warnings that we don't want.