Simplify includes in generated c++ code (#1621)

zeroc-ice · Dec 26, 2023 · 28dd68b · 28dd68b
1 parent 6dfc860
commit 28dd68b
Show file tree

Hide file tree

Showing 24 changed files with 295 additions and 111 deletions.
diff --git a/cpp/include/Ice/Communicator.h b/cpp/include/Ice/Communicator.h
@@ -39,8 +39,6 @@
 #include <Ice/ObjectAdapterF.h>
 #include <Ice/ObjectFactory.h>
 #include <Ice/ValueFactory.h>
-#include <Ice/Router.h>
-#include <Ice/Locator.h>
 #include <Ice/PluginF.h>
 #include <Ice/ImplicitContextF.h>
 #include <Ice/Current.h>

diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
@@ -8,48 +8,61 @@
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/Config.h>
 #include <Ice/Comparable.h>
-#include <Ice/Initialize.h>
-#include <Ice/Optional.h>
-#include <Ice/LocalException.h>
-#include <Ice/PropertiesAdmin.h>
-#include <Ice/Properties.h>
-#include <Ice/Logger.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/RemoteLogger.h>
-#include <Ice/Communicator.h>
-#include <Ice/CommunicatorAsync.h>
-#include <Ice/ObjectFactory.h>
-#include <Ice/ObjectAdapter.h>
-#include <Ice/ServantLocator.h>
+#include <Ice/StreamHelpers.h>
+#include <Ice/AsyncResult.h>
+#include <Ice/OutgoingAsync.h>
 #include <Ice/Proxy.h>
+#include <Ice/Current.h>
+#include <Ice/LocalException.h>
+#include <Ice/Optional.h>
 #include <Ice/Object.h>
 #include <Ice/SlicedData.h>
 #include <Ice/OutgoingAsync.h>
 #include <Ice/IncomingAsync.h>
-#include <Ice/Process.h>
-#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
-#   include <Ice/Application.h>
-#endif
-#include <Ice/Connection.h>
-#include <Ice/ConnectionAsync.h>
-#include <Ice/Functional.h>
-#include <Ice/ImplicitContext.h>
-#include <Ice/Locator.h>
-#include <Ice/Router.h>
-#include <Ice/DispatchInterceptor.h>
-#include <Ice/Plugin.h>
-#include <Ice/NativePropertiesAdmin.h>
-#include <Ice/Instrumentation.h>
-#include <Ice/Metrics.h>
-#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
-#   include <Ice/Service.h>
+#include <Ice/FactoryTable.h>
+#include <Ice/FactoryTableInit.h>
+
+#ifndef ICE_BUILDING_GENERATED_CODE
+
+    // We don't need to see the following headers when building the generated code.
+
+#   include <Ice/Initialize.h>
+#   include <Ice/Properties.h>
+#   include <Ice/Logger.h>
+#   include <Ice/LoggerUtil.h>
+#   include <Ice/Communicator.h>
+#   include <Ice/CommunicatorAsync.h>
+#   include <Ice/ObjectFactory.h>
+#   include <Ice/ObjectAdapter.h>
+#   include <Ice/ServantLocator.h>
+#   if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
+#       include <Ice/Application.h>
+#       include <Ice/Service.h>
+#   endif
+#   include <Ice/Connection.h>
+#   include <Ice/ConnectionAsync.h>
+#   include <Ice/Functional.h>
+#   include <Ice/ImplicitContext.h>
+#   include <Ice/DispatchInterceptor.h>
+#   include <Ice/Plugin.h>
+#   include <Ice/NativePropertiesAdmin.h>
+#   include <Ice/Instrumentation.h>
+#   include <Ice/RegisterPlugins.h>
+#   include <Ice/InterfaceByValue.h>
+#   include <Ice/StringConverter.h>
+#   include <Ice/IconvStringConverter.h>
+#   include <Ice/UUID.h>
+
+    // Generated header files:
+#   include <Ice/EndpointTypes.h>
+#   include <Ice/Locator.h>
+#   include <Ice/Metrics.h>
+#   include <Ice/Process.h>
+#   include <Ice/PropertiesAdmin.h>
+#   include <Ice/RemoteLogger.h>
+#   include <Ice/Router.h>
+
 #endif
-#include <Ice/RegisterPlugins.h>
-#include <Ice/InterfaceByValue.h>
-#include <Ice/StringConverter.h>
-#include <Ice/IconvStringConverter.h>
-#include <Ice/UUID.h>
-#include <Ice/EndpointTypes.h>
 #include <IceUtil/PopDisableWarnings.h>
 
 #endif
diff --git a/cpp/include/Ice/Properties.h b/cpp/include/Ice/Properties.h
@@ -32,7 +32,7 @@
 #include <Ice/FactoryTableInit.h>
 #include <IceUtil/ScopedArray.h>
 #include <Ice/Optional.h>
-#include <Ice/PropertiesAdmin.h>
+#include <Ice/PropertyDict.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION

diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
@@ -6,6 +6,8 @@
 #define ICE_STREAM_HELPERS_H
 
 #include <Ice/ObjectF.h>
+#include <Ice/ProxyF.h>
+#include <Ice/Exception.h>
 
 #ifndef ICE_CPP11_MAPPING
 #   include <IceUtil/ScopedArray.h>

diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
@@ -257,6 +257,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertiesAdmin.ice</SliceCompileSource>
     </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertyDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertyDict.ice</SliceCompileSource>
+    </ClCompile>
     <ClCompile Include="Win32\Debug\RemoteLogger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -347,6 +353,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertiesAdmin.ice</SliceCompileSource>
     </ClCompile>
+    <ClCompile Include="Win32\Release\PropertyDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertyDict.ice</SliceCompileSource>
+    </ClCompile>
     <ClCompile Include="Win32\Release\RemoteLogger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -437,6 +449,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertiesAdmin.ice</SliceCompileSource>
     </ClCompile>
+    <ClCompile Include="x64\Debug\PropertyDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertyDict.ice</SliceCompileSource>
+    </ClCompile>
     <ClCompile Include="x64\Debug\RemoteLogger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -527,6 +545,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertiesAdmin.ice</SliceCompileSource>
     </ClCompile>
+    <ClCompile Include="x64\Release\PropertyDict.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertyDict.ice</SliceCompileSource>
+    </ClCompile>
     <ClCompile Include="x64\Release\RemoteLogger.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -738,6 +762,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertiesAdmin.ice</SliceCompileSource>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\PropertyDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertyDict.ice</SliceCompileSource>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\RemoteLogger.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -828,6 +858,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertiesAdmin.ice</SliceCompileSource>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\PropertyDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertyDict.ice</SliceCompileSource>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\RemoteLogger.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -918,6 +954,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertiesAdmin.ice</SliceCompileSource>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\PropertyDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertyDict.ice</SliceCompileSource>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\RemoteLogger.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1008,6 +1050,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertiesAdmin.ice</SliceCompileSource>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\PropertyDict.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <SliceCompileSource>..\..\..\..\..\slice\Ice\PropertyDict.ice</SliceCompileSource>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\RemoteLogger.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1035,6 +1083,7 @@
     <ClInclude Include="..\..\EndpointI.h" />
   </ItemGroup>
   <ItemGroup>
+    <SliceCompile Include="..\..\..\..\..\slice\Ice\PropertyDict.ice" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters
@@ -702,6 +702,18 @@
     <ClCompile Include="x64\Release\OperationMode.cpp">
       <Filter>Source Files\x64\Release</Filter>
     </ClCompile>
+    <ClCompile Include="Win32\Debug\PropertyDict.cpp">
+      <Filter>Source Files\Win32\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Debug\PropertyDict.cpp">
+      <Filter>Source Files\x64\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Win32\Release\PropertyDict.cpp">
+      <Filter>Source Files\Win32\Release</Filter>
+    </ClCompile>
+    <ClCompile Include="x64\Release\PropertyDict.cpp">
+      <Filter>Source Files\x64\Release</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\EventLoggerMsg.mc">
@@ -895,6 +907,18 @@
     <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\OperationMode.h">
       <Filter>Header Files\x64\Release</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\PropertyDict.h">
+      <Filter>Header Files\Win32\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\PropertyDict.h">
+      <Filter>Header Files\x64\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\PropertyDict.h">
+      <Filter>Header Files\Win32\Release</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\PropertyDict.h">
+      <Filter>Header Files\x64\Release</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <SliceCompile Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice">
@@ -942,5 +966,8 @@
     <SliceCompile Include="..\..\..\..\..\slice\Ice\OperationMode.ice">
       <Filter>Slice Files</Filter>
     </SliceCompile>
+    <SliceCompile Include="..\..\..\..\..\slice\Ice\PropertyDict.ice">
+      <Filter>Slice Files</Filter>
+    </SliceCompile>
   </ItemGroup>
 </Project>