diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h index ab5c81e0f7f..0ab0733a8e0 100644 --- a/cpp/include/Ice/FactoryTable.h +++ b/cpp/include/Ice/FactoryTable.h @@ -14,7 +14,6 @@ #include #include #include -#include namespace IceInternal { diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index c07900d286b..ed97e22f65a 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -6,7 +6,6 @@ #include "BatchRequestQueue.h" #include "CheckIdentity.h" #include "DefaultsAndOverrides.h" -#include "DisableWarnings.h" #include "Endian.h" #include "EndpointI.h" #include "Ice/IncomingRequest.h" @@ -24,6 +23,8 @@ #include "TraceUtil.h" #include "Transceiver.h" +#include "DisableWarnings.h" + #include #include diff --git a/cpp/src/Ice/FileUtil.cpp b/cpp/src/Ice/FileUtil.cpp index 2a546ff5d41..6d384cfc334 100644 --- a/cpp/src/Ice/FileUtil.cpp +++ b/cpp/src/Ice/FileUtil.cpp @@ -3,9 +3,11 @@ // #include "FileUtil.h" -#include "DisableWarnings.h" #include "Ice/StringConverter.h" #include "Ice/StringUtil.h" + +#include "DisableWarnings.h" + #include #include #include diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index a4ecc5d0262..c281d67a412 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -4,7 +4,6 @@ #include "Ice/InputStream.h" #include "DefaultsAndOverrides.h" -#include "DisableWarnings.h" #include "Endian.h" #include "Ice/FactoryTable.h" #include "Ice/LocalExceptions.h" @@ -20,6 +19,8 @@ #include "TraceLevels.h" #include "TraceUtil.h" +#include "DisableWarnings.h" + #include using namespace std; diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index d4ba3054b5e..d5b1fc9fb77 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -7,7 +7,6 @@ #include "ConnectionFactory.h" #include "ConsoleUtil.h" #include "DefaultsAndOverrides.h" -#include "DisableWarnings.h" #include "EndpointFactoryManager.h" #include "FileUtil.h" #include "IPEndpointI.h" // For EndpointHostResolver @@ -42,6 +41,8 @@ #include "ValueFactoryManagerI.h" #include "WSEndpoint.h" +#include "DisableWarnings.h" + #include #include #include diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp index 0ee8050df82..e60a4968686 100644 --- a/cpp/src/Ice/InstrumentationI.cpp +++ b/cpp/src/Ice/InstrumentationI.cpp @@ -3,7 +3,6 @@ // #include "InstrumentationI.h" - #include "Ice/Communicator.h" #include "Ice/Connection.h" #include "Ice/Endpoint.h" diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index 8d2971370bb..7011dbec3b3 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -3,7 +3,6 @@ // #include "LocatorInfo.h" -#include "DisableWarnings.h" #include "EndpointI.h" #include "Ice/Comparable.h" #include "Ice/LocalExceptions.h" @@ -15,6 +14,8 @@ #include "Reference.h" #include "TraceLevels.h" +#include "DisableWarnings.h" + #include using namespace std; diff --git a/cpp/src/Ice/SSL/SecureTransportTransceiverI.cpp b/cpp/src/Ice/SSL/SecureTransportTransceiverI.cpp index 7425609d704..b497689ae2e 100644 --- a/cpp/src/Ice/SSL/SecureTransportTransceiverI.cpp +++ b/cpp/src/Ice/SSL/SecureTransportTransceiverI.cpp @@ -11,7 +11,6 @@ #include "SecureTransportUtil.h" #include -#include // Disable deprecation warnings from SecureTransport APIs #include "../DisableWarnings.h" diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp index a306169e26c..57f7ac74ab6 100644 --- a/cpp/src/IceGrid/AllocatableObjectCache.cpp +++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp @@ -3,7 +3,6 @@ // #include "AllocatableObjectCache.h" - #include "../Ice/Random.h" #include "Ice/Communicator.h" #include "Ice/LocalExceptions.h" diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h index 9ab2269b44e..58a4de39259 100644 --- a/cpp/src/IceGrid/Database.h +++ b/cpp/src/IceGrid/Database.h @@ -6,6 +6,7 @@ #define ICEGRID_DATABASE_H #include "../Ice/FileUtil.h" +#include "../IceDB/IceDB.h" #include "AdapterCache.h" #include "AllocatableObjectCache.h" #include "Ice/CommunicatorF.h" @@ -18,8 +19,6 @@ #include "ServerCache.h" #include "Topics.h" -#include "../IceDB/IceDB.h" - namespace IceGrid { class AdminSessionI; diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index 6429c173067..bbecf35132f 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -7,11 +7,10 @@ #include "Database.h" #include "Ice/Ice.h" #include "SessionI.h" +#include "SynchronizationException.h" #include "Util.h" #include "WellKnownObjectsManager.h" -#include "SynchronizationException.h" - using namespace std; using namespace std::chrono; using namespace IceGrid; diff --git a/cpp/src/IceGrid/LocatorRegistryI.cpp b/cpp/src/IceGrid/LocatorRegistryI.cpp index 1ff9356e330..ece7a5b1a04 100644 --- a/cpp/src/IceGrid/LocatorRegistryI.cpp +++ b/cpp/src/IceGrid/LocatorRegistryI.cpp @@ -6,9 +6,8 @@ #include "Database.h" #include "Ice/Ice.h" #include "ReplicaSessionManager.h" -#include "Util.h" - #include "SynchronizationException.h" +#include "Util.h" using namespace std; using namespace IceGrid; diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index c688eb396b7..0a5fd5dc1ed 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -3,7 +3,6 @@ // #include "NodeI.h" - #include "../Ice/FileUtil.h" #include "Activator.h" #include "Ice/Ice.h" diff --git a/cpp/src/IceGrid/RegistryAdminRouter.cpp b/cpp/src/IceGrid/RegistryAdminRouter.cpp index 8e2aca9e68d..0ae30faabd3 100644 --- a/cpp/src/IceGrid/RegistryAdminRouter.cpp +++ b/cpp/src/IceGrid/RegistryAdminRouter.cpp @@ -4,7 +4,6 @@ #include "RegistryAdminRouter.h" #include "Ice/Ice.h" - #include "SynchronizationException.h" using namespace IceGrid; diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp index 8c26e64cdc3..f44556509f2 100644 --- a/cpp/src/IceGrid/ReplicaSessionI.cpp +++ b/cpp/src/IceGrid/ReplicaSessionI.cpp @@ -2,11 +2,10 @@ // Copyright (c) ZeroC, Inc. All rights reserved. // -#include "Ice/Ice.h" - +#include "ReplicaSessionI.h" #include "Database.h" +#include "Ice/Ice.h" #include "PlatformInfo.h" -#include "ReplicaSessionI.h" #include "WellKnownObjectsManager.h" using namespace std; diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index d4d66f6d257..4197cad7fa3 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -3,7 +3,6 @@ // #include "ServerCache.h" -#include "../Ice/DisableWarnings.h" #include "AdapterCache.h" #include "AllocatableObjectCache.h" #include "DescriptorHelper.h" @@ -13,9 +12,10 @@ #include "NodeCache.h" #include "ObjectCache.h" #include "SessionI.h" +#include "SynchronizationException.h" #include "Topics.h" -#include "SynchronizationException.h" +#include "../Ice/DisableWarnings.h" using namespace std; using namespace IceGrid; diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 0852866ed78..b8cbff7b189 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -3,7 +3,6 @@ // #include "ServerI.h" -#include "../Ice/DisableWarnings.h" #include "../Ice/FileUtil.h" #include "../Ice/TimeUtil.h" #include "Activator.h" @@ -14,6 +13,8 @@ #include "TraceLevels.h" #include "Util.h" +#include "../Ice/DisableWarnings.h" + #include #include diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index d1ec38da6d2..8e042d22e3a 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -10,7 +10,6 @@ #include #include #include -#include // TODO: fix this warning once we no longer support VS2013 and earlier #if defined(_MSC_VER) diff --git a/cpp/src/Slice/StringLiteralUtil.cpp b/cpp/src/Slice/StringLiteralUtil.cpp index 820e77cacf2..48b70004acb 100644 --- a/cpp/src/Slice/StringLiteralUtil.cpp +++ b/cpp/src/Slice/StringLiteralUtil.cpp @@ -1,8 +1,7 @@ // Copyright (c) ZeroC, Inc. -#include "Util.h" - #include "Ice/StringConverter.h" +#include "Util.h" #include #include diff --git a/cpp/test/DataStorm/api/Writer.cpp b/cpp/test/DataStorm/api/Writer.cpp index fe6edd04ec3..3232dbffdcf 100644 --- a/cpp/test/DataStorm/api/Writer.cpp +++ b/cpp/test/DataStorm/api/Writer.cpp @@ -3,7 +3,6 @@ // #include "DataStorm/DataStorm.h" - #include "Test.h" #include "TestHelper.h" diff --git a/cpp/test/Ice/background/Configuration.h b/cpp/test/Ice/background/Configuration.h index 91f3ab85568..7b351afb322 100644 --- a/cpp/test/Ice/background/Configuration.h +++ b/cpp/test/Ice/background/Configuration.h @@ -6,7 +6,6 @@ #define TEST_CONFIGURATION_H #include "Ice/Ice.h" - #include "Ice/LocalExceptions.h" #include "Ice/Selector.h" diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp index 521c21973a4..3d39b34d7b8 100644 --- a/cpp/test/Ice/background/EndpointI.cpp +++ b/cpp/test/Ice/background/EndpointI.cpp @@ -7,7 +7,6 @@ #endif #include "EndpointI.h" - #include "Acceptor.h" #include "Connector.h" #include "Transceiver.h" diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index bb4c88f7e6d..4dabac07373 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -4,13 +4,12 @@ #include "Configuration.h" #include "Ice/Ice.h" +#include "Ice/Locator.h" +#include "Ice/Router.h" #include "PluginI.h" #include "TestHelper.h" #include "TestI.h" -#include "Ice/Locator.h" -#include "Ice/Router.h" - #ifdef _MSC_VER # pragma comment(lib, ICE_LIBNAME("testtransport")) #endif diff --git a/cpp/test/Ice/echo/Server.cpp b/cpp/test/Ice/echo/Server.cpp index 346adf0eb81..d1f2d9455db 100644 --- a/cpp/test/Ice/echo/Server.cpp +++ b/cpp/test/Ice/echo/Server.cpp @@ -5,7 +5,6 @@ #include "BlobjectI.h" #include "Ice/Ice.h" #include "Test.h" - #include "TestHelper.h" using namespace std; diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index 227a4364e74..6a3505f70ed 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -6,7 +6,6 @@ #include "Test.h" #include "TestHelper.h" #include -#include // // Visual C++ defines min and max as macros diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 61a93877fef..0f8b7d850b0 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -4,9 +4,7 @@ #include "Ice/Ice.h" #include "Test.h" - #include "TestHelper.h" -#include // // Work-around for GCC warning bug diff --git a/cpp/test/IceGrid/deployer/TestI.cpp b/cpp/test/IceGrid/deployer/TestI.cpp index 5d4ceeecac8..f004827630f 100644 --- a/cpp/test/IceGrid/deployer/TestI.cpp +++ b/cpp/test/IceGrid/deployer/TestI.cpp @@ -4,7 +4,6 @@ #include "TestI.h" #include "Ice/Ice.h" -#include TestI::TestI(Ice::PropertiesPtr properties) : _properties(std::move(properties)) {} diff --git a/cpp/test/IceGrid/replicaGroup/TestI.cpp b/cpp/test/IceGrid/replicaGroup/TestI.cpp index 0aac11891fd..dcfaab2649a 100644 --- a/cpp/test/IceGrid/replicaGroup/TestI.cpp +++ b/cpp/test/IceGrid/replicaGroup/TestI.cpp @@ -4,7 +4,6 @@ #include "TestI.h" #include "Ice/Ice.h" -#include TestI::TestI(Ice::PropertiesPtr properties) : _properties(std::move(properties)) {}