Moved some cpp files from IceUtil to Ice

Fixed UWP/static libs linking with Ice on Windows
author: Bernard Normier <bernard@zeroc.com> 2016-05-13 12:18:43 -0400
committer: Bernard Normier <bernard@zeroc.com> 2016-05-13 12:18:43 -0400
commit: 5aea2d90460e00d2505672c5a389f6f42267a156 (patch)
tree: 99618f7ce47bb1b25f01559d3c91f0f47912afb7
parent: Merge remote-tracking branch 'origin/3.6' (diff)
download: ice-5aea2d90460e00d2505672c5a389f6f42267a156.tar.bz2
ice-5aea2d90460e00d2505672c5a389f6f42267a156.tar.xz
ice-5aea2d90460e00d2505672c5a389f6f42267a156.zip
26 files changed, 125 insertions, 299 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index aa86962edd5..169d088feee 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -241,7 +241,7 @@
 //
 //  Automatically link with Ice[D|++11|++11D].lib
 //
-#   if !defined(ICE_STATIC_LIBS) && !defined(ICE_BUILDING_ICE)
+#   if !defined(ICE_BUILDING_ICE) && !defined(ICE_BUILDING_SLICE_COMPILERS)
 #      pragma comment(lib, ICE_LIBNAME("Ice"))
 #   endif
 #endif
diff --git a/cpp/src/IceUtil/ArgVector.cpp b/cpp/src/Ice/ArgVector.cpp
index 149c7172bc6..149c7172bc6 100644
--- a/cpp/src/IceUtil/ArgVector.cpp
+++ b/cpp/src/Ice/ArgVector.cpp
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/Ice/Cond.cpp
index b833036e87b..b833036e87b 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/Ice/Cond.cpp
diff --git a/cpp/src/IceUtil/CountDownLatch.cpp b/cpp/src/Ice/CountDownLatch.cpp
index cbdd4d5bcf2..cbdd4d5bcf2 100644
--- a/cpp/src/IceUtil/CountDownLatch.cpp
+++ b/cpp/src/Ice/CountDownLatch.cpp
diff --git a/cpp/src/IceUtil/SHA1.cpp b/cpp/src/Ice/SHA1.cpp
index 4373afa15f8..4373afa15f8 100644
--- a/cpp/src/IceUtil/SHA1.cpp
+++ b/cpp/src/Ice/SHA1.cpp
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index 3c32aacd339..663ee64b7e9 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+#ifndef _WIN32
+
 #include <Ice/SysLoggerI.h>
 #include <Ice/LocalException.h>
 #include <syslog.h>
@@ -165,3 +167,5 @@ Ice::SysLoggerI::cloneWithPrefix(const string& prefix)
 {
     return ICE_MAKE_SHARED(SysLoggerI, prefix, _facility);
 }
+
+#endif
diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 12c5fc1738c..12c5fc1738c 100644
--- a/cpp/src/IceUtil/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
diff --git a/cpp/src/IceUtil/Timer.cpp b/cpp/src/Ice/Timer.cpp
index 2f4d88f7680..2f4d88f7680 100644
--- a/cpp/src/IceUtil/Timer.cpp
+++ b/cpp/src/Ice/Timer.cpp
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
index 01601b4f3d4..f7b60592918 100644
--- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -189,98 +189,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\IceUtil\*.cpp" />
-    <ClCompile Include="..\..\Acceptor.cpp" />
-    <ClCompile Include="..\..\ACM.cpp" />
-    <ClCompile Include="..\..\Application.cpp" />
-    <ClCompile Include="..\..\AsyncResult.cpp" />
-    <ClCompile Include="..\..\Base64.cpp" />
-    <ClCompile Include="..\..\BatchRequestQueue.cpp" />
-    <ClCompile Include="..\..\Buffer.cpp" />
-    <ClCompile Include="..\..\CollocatedRequestHandler.cpp" />
-    <ClCompile Include="..\..\CommunicatorI.cpp" />
-    <ClCompile Include="..\..\ConnectionFactory.cpp" />
-    <ClCompile Include="..\..\ConnectionI.cpp" />
-    <ClCompile Include="..\..\ConnectionRequestHandler.cpp" />
-    <ClCompile Include="..\..\Connector.cpp" />
-    <ClCompile Include="..\..\ConnectRequestHandler.cpp" />
-    <ClCompile Include="..\..\DefaultsAndOverrides.cpp" />
-    <ClCompile Include="..\..\DispatchInterceptor.cpp" />
-    <ClCompile Include="..\..\DLLMain.cpp" />
-    <ClCompile Include="..\..\DynamicLibrary.cpp" />
-    <ClCompile Include="..\..\EndpointFactory.cpp" />
-    <ClCompile Include="..\..\EndpointFactoryManager.cpp" />
-    <ClCompile Include="..\..\EndpointI.cpp" />
-    <ClCompile Include="..\..\EventHandler.cpp" />
-    <ClCompile Include="..\..\Exception.cpp" />
-    <ClCompile Include="..\..\FactoryTable.cpp" />
-    <ClCompile Include="..\..\FactoryTableInit.cpp" />
-    <ClCompile Include="..\..\GCObject.cpp" />
-    <ClCompile Include="..\..\HttpParser.cpp" />
-    <ClCompile Include="..\..\ImplicitContextI.cpp" />
-    <ClCompile Include="..\..\Incoming.cpp" />
-    <ClCompile Include="..\..\IncomingAsync.cpp" />
-    <ClCompile Include="..\..\Initialize.cpp" />
-    <ClCompile Include="..\..\InputStream.cpp" />
-    <ClCompile Include="..\..\Instance.cpp" />
-    <ClCompile Include="..\..\InstrumentationI.cpp" />
-    <ClCompile Include="..\..\IPEndpointI.cpp" />
-    <ClCompile Include="..\..\LocalObject.cpp" />
-    <ClCompile Include="..\..\LocatorInfo.cpp" />
-    <ClCompile Include="..\..\LoggerAdminI.cpp" />
-    <ClCompile Include="..\..\LoggerI.cpp" />
-    <ClCompile Include="..\..\LoggerUtil.cpp" />
-    <ClCompile Include="..\..\MetricsAdminI.cpp" />
-    <ClCompile Include="..\..\MetricsObserverI.cpp" />
-    <ClCompile Include="..\..\Network.cpp" />
-    <ClCompile Include="..\..\NetworkProxy.cpp" />
-    <ClCompile Include="..\..\Object.cpp" />
-    <ClCompile Include="..\..\ObjectAdapterFactory.cpp" />
-    <ClCompile Include="..\..\ObjectAdapterI.cpp" />
-    <ClCompile Include="..\..\ObserverHelper.cpp" />
-    <ClCompile Include="..\..\OpaqueEndpointI.cpp" />
-    <ClCompile Include="..\..\Outgoing.cpp" />
-    <ClCompile Include="..\..\OutgoingAsync.cpp" />
-    <ClCompile Include="..\..\OutputStream.cpp" />
-    <ClCompile Include="..\..\PluginManagerI.cpp" />
-    <ClCompile Include="..\..\PropertiesAdminI.cpp" />
-    <ClCompile Include="..\..\PropertiesI.cpp" />
-    <ClCompile Include="..\..\PropertyNames.cpp" />
-    <ClCompile Include="..\..\Protocol.cpp" />
-    <ClCompile Include="..\..\ProtocolInstance.cpp" />
-    <ClCompile Include="..\..\ProtocolPluginFacade.cpp" />
-    <ClCompile Include="..\..\Proxy.cpp" />
-    <ClCompile Include="..\..\ProxyFactory.cpp" />
-    <ClCompile Include="..\..\Reference.cpp" />
-    <ClCompile Include="..\..\ReferenceFactory.cpp" />
-    <ClCompile Include="..\..\RegisterPluginsInit.cpp" />
-    <ClCompile Include="..\..\RequestHandler.cpp" />
-    <ClCompile Include="..\..\RequestHandlerFactory.cpp" />
-    <ClCompile Include="..\..\ResponseHandler.cpp" />
-    <ClCompile Include="..\..\RetryQueue.cpp" />
-    <ClCompile Include="..\..\RouterInfo.cpp" />
-    <ClCompile Include="..\..\Selector.cpp" />
-    <ClCompile Include="..\..\ServantManager.cpp" />
-    <ClCompile Include="..\..\Service.cpp" />
-    <ClCompile Include="..\..\SliceChecksums.cpp" />
-    <ClCompile Include="..\..\SlicedData.cpp" />
-    <ClCompile Include="..\..\StreamSocket.cpp" />
-    <ClCompile Include="..\..\TcpAcceptor.cpp" />
-    <ClCompile Include="..\..\TcpConnector.cpp" />
-    <ClCompile Include="..\..\TcpEndpointI.cpp" />
-    <ClCompile Include="..\..\TcpTransceiver.cpp" />
-    <ClCompile Include="..\..\ThreadPool.cpp" />
-    <ClCompile Include="..\..\TraceLevels.cpp" />
-    <ClCompile Include="..\..\TraceUtil.cpp" />
-    <ClCompile Include="..\..\Transceiver.cpp" />
-    <ClCompile Include="..\..\UdpConnector.cpp" />
-    <ClCompile Include="..\..\UdpEndpointI.cpp" />
-    <ClCompile Include="..\..\UdpTransceiver.cpp" />
-    <ClCompile Include="..\..\Value.cpp" />
-    <ClCompile Include="..\..\ValueFactoryManagerI.cpp" />
-    <ClCompile Include="..\..\WSAcceptor.cpp" />
-    <ClCompile Include="..\..\WSConnector.cpp" />
-    <ClCompile Include="..\..\WSEndpoint.cpp" />
-    <ClCompile Include="..\..\WSTransceiver.cpp" />
+    <ClCompile Include="..\..\*.cpp" />
     <ClCompile Include="Win32\Debug\BuiltinSequences.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1860,4 +1769,4 @@
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" />
   </Target>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj
index 4cc4cd8cd87..bec21218a56 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -194,98 +194,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\IceUtil\*.cpp" />
-    <ClCompile Include="..\..\Acceptor.cpp" />
-    <ClCompile Include="..\..\ACM.cpp" />
-    <ClCompile Include="..\..\Application.cpp" />
-    <ClCompile Include="..\..\AsyncResult.cpp" />
-    <ClCompile Include="..\..\Base64.cpp" />
-    <ClCompile Include="..\..\BatchRequestQueue.cpp" />
-    <ClCompile Include="..\..\Buffer.cpp" />
-    <ClCompile Include="..\..\CollocatedRequestHandler.cpp" />
-    <ClCompile Include="..\..\CommunicatorI.cpp" />
-    <ClCompile Include="..\..\ConnectionFactory.cpp" />
-    <ClCompile Include="..\..\ConnectionI.cpp" />
-    <ClCompile Include="..\..\ConnectionRequestHandler.cpp" />
-    <ClCompile Include="..\..\Connector.cpp" />
-    <ClCompile Include="..\..\ConnectRequestHandler.cpp" />
-    <ClCompile Include="..\..\DefaultsAndOverrides.cpp" />
-    <ClCompile Include="..\..\DispatchInterceptor.cpp" />
-    <ClCompile Include="..\..\DLLMain.cpp" />
-    <ClCompile Include="..\..\DynamicLibrary.cpp" />
-    <ClCompile Include="..\..\EndpointFactory.cpp" />
-    <ClCompile Include="..\..\EndpointFactoryManager.cpp" />
-    <ClCompile Include="..\..\EndpointI.cpp" />
-    <ClCompile Include="..\..\EventHandler.cpp" />
-    <ClCompile Include="..\..\Exception.cpp" />
-    <ClCompile Include="..\..\FactoryTable.cpp" />
-    <ClCompile Include="..\..\FactoryTableInit.cpp" />
-    <ClCompile Include="..\..\GCObject.cpp" />
-    <ClCompile Include="..\..\HttpParser.cpp" />
-    <ClCompile Include="..\..\ImplicitContextI.cpp" />
-    <ClCompile Include="..\..\Incoming.cpp" />
-    <ClCompile Include="..\..\IncomingAsync.cpp" />
-    <ClCompile Include="..\..\Initialize.cpp" />
-    <ClCompile Include="..\..\InputStream.cpp" />
-    <ClCompile Include="..\..\Instance.cpp" />
-    <ClCompile Include="..\..\InstrumentationI.cpp" />
-    <ClCompile Include="..\..\IPEndpointI.cpp" />
-    <ClCompile Include="..\..\LocalObject.cpp" />
-    <ClCompile Include="..\..\LocatorInfo.cpp" />
-    <ClCompile Include="..\..\LoggerAdminI.cpp" />
-    <ClCompile Include="..\..\LoggerI.cpp" />
-    <ClCompile Include="..\..\LoggerUtil.cpp" />
-    <ClCompile Include="..\..\MetricsAdminI.cpp" />
-    <ClCompile Include="..\..\MetricsObserverI.cpp" />
-    <ClCompile Include="..\..\Network.cpp" />
-    <ClCompile Include="..\..\NetworkProxy.cpp" />
-    <ClCompile Include="..\..\Object.cpp" />
-    <ClCompile Include="..\..\ObjectAdapterFactory.cpp" />
-    <ClCompile Include="..\..\ObjectAdapterI.cpp" />
-    <ClCompile Include="..\..\ObserverHelper.cpp" />
-    <ClCompile Include="..\..\OpaqueEndpointI.cpp" />
-    <ClCompile Include="..\..\Outgoing.cpp" />
-    <ClCompile Include="..\..\OutgoingAsync.cpp" />
-    <ClCompile Include="..\..\OutputStream.cpp" />
-    <ClCompile Include="..\..\PluginManagerI.cpp" />
-    <ClCompile Include="..\..\PropertiesAdminI.cpp" />
-    <ClCompile Include="..\..\PropertiesI.cpp" />
-    <ClCompile Include="..\..\PropertyNames.cpp" />
-    <ClCompile Include="..\..\Protocol.cpp" />
-    <ClCompile Include="..\..\ProtocolInstance.cpp" />
-    <ClCompile Include="..\..\ProtocolPluginFacade.cpp" />
-    <ClCompile Include="..\..\Proxy.cpp" />
-    <ClCompile Include="..\..\ProxyFactory.cpp" />
-    <ClCompile Include="..\..\Reference.cpp" />
-    <ClCompile Include="..\..\ReferenceFactory.cpp" />
-    <ClCompile Include="..\..\RegisterPluginsInit.cpp" />
-    <ClCompile Include="..\..\RequestHandler.cpp" />
-    <ClCompile Include="..\..\RequestHandlerFactory.cpp" />
-    <ClCompile Include="..\..\ResponseHandler.cpp" />
-    <ClCompile Include="..\..\RetryQueue.cpp" />
-    <ClCompile Include="..\..\RouterInfo.cpp" />
-    <ClCompile Include="..\..\Selector.cpp" />
-    <ClCompile Include="..\..\ServantManager.cpp" />
-    <ClCompile Include="..\..\Service.cpp" />
-    <ClCompile Include="..\..\SliceChecksums.cpp" />
-    <ClCompile Include="..\..\SlicedData.cpp" />
-    <ClCompile Include="..\..\StreamSocket.cpp" />
-    <ClCompile Include="..\..\TcpAcceptor.cpp" />
-    <ClCompile Include="..\..\TcpConnector.cpp" />
-    <ClCompile Include="..\..\TcpEndpointI.cpp" />
-    <ClCompile Include="..\..\TcpTransceiver.cpp" />
-    <ClCompile Include="..\..\ThreadPool.cpp" />
-    <ClCompile Include="..\..\TraceLevels.cpp" />
-    <ClCompile Include="..\..\TraceUtil.cpp" />
-    <ClCompile Include="..\..\Transceiver.cpp" />
-    <ClCompile Include="..\..\UdpConnector.cpp" />
-    <ClCompile Include="..\..\UdpEndpointI.cpp" />
-    <ClCompile Include="..\..\UdpTransceiver.cpp" />
-    <ClCompile Include="..\..\Value.cpp" />
-    <ClCompile Include="..\..\ValueFactoryManagerI.cpp" />
-    <ClCompile Include="..\..\WSAcceptor.cpp" />
-    <ClCompile Include="..\..\WSConnector.cpp" />
-    <ClCompile Include="..\..\WSEndpoint.cpp" />
-    <ClCompile Include="..\..\WSTransceiver.cpp" />
+    <ClCompile Include="..\..\*.cpp" />
     <ClCompile Include="Win32\Debug\BuiltinSequences.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1867,4 +1776,4 @@
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" />
     <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" />
   </Target>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj
index 29df8a2a3ad..c6fe7a4255b 100644
--- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj
+++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -132,10 +132,10 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\IceUtil\ArgVector.cpp" />
-    <ClCompile Include="..\..\..\IceUtil\Cond.cpp" />
+    <ClCompile Include="..\..\ArgVector.cpp" />
+    <ClCompile Include="..\..\Cond.cpp" />
     <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp" />
-    <ClCompile Include="..\..\..\IceUtil\CountDownLatch.cpp" />
+    <ClCompile Include="..\..\CountDownLatch.cpp" />
     <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp" />
     <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp" />
     <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp" />
@@ -143,14 +143,14 @@
     <ClCompile Include="..\..\..\IceUtil\OutputUtil.cpp" />
     <ClCompile Include="..\..\..\IceUtil\Random.cpp" />
     <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp" />
-    <ClCompile Include="..\..\..\IceUtil\SHA1.cpp" />
+    <ClCompile Include="..\..\SHA1.cpp" />
     <ClCompile Include="..\..\..\IceUtil\Shared.cpp" />
     <ClCompile Include="..\..\..\IceUtil\StringConverter.cpp" />
     <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp" />
-    <ClCompile Include="..\..\..\IceUtil\Thread.cpp" />
+    <ClCompile Include="..\..\Thread.cpp" />
     <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp" />
     <ClCompile Include="..\..\..\IceUtil\Time.cpp" />
-    <ClCompile Include="..\..\..\IceUtil\Timer.cpp" />
+    <ClCompile Include="..\..\Timer.cpp" />
     <ClCompile Include="..\..\..\IceUtil\Unicode.cpp" />
     <ClCompile Include="..\..\..\IceUtil\UtilException.cpp" />
     <ClCompile Include="..\..\..\IceUtil\UUID.cpp" />
diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters
index a2eeca3b49e..f6d97e7170b 100644
--- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters
+++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters
@@ -1036,27 +1036,15 @@
     <ClCompile Include="x64\Release\Version.cpp">
       <Filter>Source Files\x64\Release</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\ArgVector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\Cond.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\IceUtil\ConvertUTF.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\CountDownLatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\IceUtil\FileUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\IceUtil\InputUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\IceUtil\Options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1069,9 +1057,6 @@
     <ClCompile Include="..\..\..\IceUtil\RecMutex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\SHA1.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\IceUtil\Shared.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1081,18 +1066,12 @@
     <ClCompile Include="..\..\..\IceUtil\StringUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\Thread.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\IceUtil\ThreadException.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\IceUtil\Time.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\IceUtil\Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\IceUtil\Unicode.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -1102,6 +1081,27 @@
     <ClCompile Include="..\..\..\IceUtil\UUID.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\ArgVector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Cond.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CountDownLatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\IceUtil\MutexProtocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SHA1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <IceBuilder Include="..\..\..\..\..\slice\Ice\BuiltinSequences.ice">
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
index cac7058fff3..397b85c6b3c 100644
--- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
@@ -61,29 +61,42 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>  
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\ArgVector.cpp" />
-    <ClCompile Include="..\..\Cond.cpp" />
     <ClCompile Include="..\..\ConvertUTF.cpp" />
-    <ClCompile Include="..\..\CountDownLatch.cpp" />
     <ClCompile Include="..\..\CtrlCHandler.cpp" />
+    <ClCompile Include="..\..\OutputUtil.cpp" />
+    <ClCompile Include="..\..\RecMutex.cpp" />
+    <ClCompile Include="..\..\StringConverter.cpp" />
+    <ClCompile Include="..\..\ThreadException.cpp" />
+    <ClCompile Include="..\..\Time.cpp" />
     <ClCompile Include="..\..\UtilException.cpp" />
     <ClCompile Include="..\..\FileUtil.cpp" />
     <ClCompile Include="..\..\InputUtil.cpp" />
-    <ClCompile Include="..\..\MutexProtocol.cpp" />
     <ClCompile Include="..\..\Options.cpp" />
-    <ClCompile Include="..\..\OutputUtil.cpp" />
     <ClCompile Include="..\..\Random.cpp" />
-    <ClCompile Include="..\..\RecMutex.cpp" />
-    <ClCompile Include="..\..\SHA1.cpp" />
     <ClCompile Include="..\..\Shared.cpp" />
-    <ClCompile Include="..\..\StringConverter.cpp" />
     <ClCompile Include="..\..\StringUtil.cpp" />
-    <ClCompile Include="..\..\Thread.cpp" />
-    <ClCompile Include="..\..\ThreadException.cpp" />
-    <ClCompile Include="..\..\Time.cpp" />
-    <ClCompile Include="..\..\Timer.cpp" />
     <ClCompile Include="..\..\Unicode.cpp" />
     <ClCompile Include="..\..\UUID.cpp" />
   </ItemGroup>
@@ -136,4 +149,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
+\ No newline at end of file
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
index b60350fc4d0..0370d470a60 100644
--- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
@@ -15,18 +15,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\ArgVector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Cond.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ConvertUTF.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\CountDownLatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\CtrlCHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -39,49 +30,37 @@
     <ClCompile Include="..\..\InputUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\MutexProtocol.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\OutputUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Random.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\RecMutex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\SHA1.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Shared.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\StringConverter.cpp">
+    <ClCompile Include="..\..\StringUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\StringUtil.cpp">
+    <ClCompile Include="..\..\Unicode.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Thread.cpp">
+    <ClCompile Include="..\..\UUID.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ThreadException.cpp">
+    <ClCompile Include="..\..\OutputUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Time.cpp">
+    <ClCompile Include="..\..\RecMutex.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Timer.cpp">
+    <ClCompile Include="..\..\ThreadException.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Unicode.cpp">
+    <ClCompile Include="..\..\StringConverter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\UUID.cpp">
+    <ClCompile Include="..\..\Time.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj
index c495f735108..56da4105e54 100644
--- a/cpp/src/Slice/msbuild/slice.vcxproj
+++ b/cpp/src/Slice/msbuild/slice.vcxproj
@@ -63,6 +63,26 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Checksum.cpp" />
     <ClCompile Include="..\CPlusPlusUtil.cpp" />
@@ -71,7 +91,6 @@
     <ClCompile Include="..\JavaUtil.cpp" />
     <ClCompile Include="..\MD5.cpp" />
     <ClCompile Include="..\MD5I.cpp" />
-    <ClCompile Include="..\ObjCUtil.cpp" />
     <ClCompile Include="..\Parser.cpp" />
     <ClCompile Include="..\PHPUtil.cpp" />
     <ClCompile Include="..\Preprocessor.cpp" />
@@ -87,7 +106,6 @@
     <ClInclude Include="..\CPlusPlusUtil.h" />
     <ClInclude Include="..\FileTracker.h" />
     <ClInclude Include="..\JavaUtil.h" />
-    <ClInclude Include="..\ObjCUtil.h" />
     <ClInclude Include="..\Parser.h" />
     <ClInclude Include="..\PHPUtil.h" />
     <ClInclude Include="..\Preprocessor.h" />
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters
index fd3091d1980..09e0f16cb50 100644
--- a/cpp/src/Slice/msbuild/slice.vcxproj.filters
+++ b/cpp/src/Slice/msbuild/slice.vcxproj.filters
@@ -36,9 +36,6 @@
     <ClCompile Include="..\MD5I.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\ObjCUtil.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\Parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -92,9 +89,6 @@
     <ClInclude Include="..\JavaUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\ObjCUtil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\Parser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
index fe49979724f..16a69b83a0b 100644
--- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
+++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
@@ -65,7 +65,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -73,7 +73,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -89,7 +89,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
index a8cc6862665..7708db7883e 100644
--- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
+++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
@@ -66,7 +66,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -84,7 +84,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -136,4 +136,4 @@
     <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" />
     <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" />
   </Target>
-</Project>
+</Project>
+\ No newline at end of file
diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj b/cpp/src/slice2html/msbuild/slice2html.vcxproj
index 493cdedce11..3e833916756 100644
--- a/cpp/src/slice2html/msbuild/slice2html.vcxproj
+++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj
@@ -66,7 +66,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -84,7 +84,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj
index b0e7a00ae80..91a6a4f7741 100644
--- a/cpp/src/slice2java/msbuild/slice2java.vcxproj
+++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj
@@ -66,7 +66,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -84,7 +84,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj
index 4a1663a1a20..c3b44bff5bc 100644
--- a/cpp/src/slice2js/msbuild/slice2js.vcxproj
+++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj
@@ -65,7 +65,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -83,7 +83,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -92,7 +92,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h
index efbe661af7e..75d86c78285 100644
--- a/cpp/src/slice2objc/Gen.h
+++ b/cpp/src/slice2objc/Gen.h
@@ -10,7 +10,7 @@
 #ifndef GEN_H
 #define GEN_H
 
-#include <Slice/ObjCUtil.h>
+#include <ObjCUtil.h>
 
 namespace Slice
 {
diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 2bc590812f8..8247915d841 100644
--- a/cpp/src/Slice/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <Slice/ObjCUtil.h>
+#include <ObjCUtil.h>
 #include <Slice/Util.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
diff --git a/cpp/src/Slice/ObjCUtil.h b/cpp/src/slice2objc/ObjCUtil.h
index 7c8236ede63..7c8236ede63 100644
--- a/cpp/src/Slice/ObjCUtil.h
+++ b/cpp/src/slice2objc/ObjCUtil.h
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj
index 303363cf4fe..ea9211ecdea 100644
--- a/cpp/src/slice2php/msbuild/slice2php.vcxproj
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj
@@ -65,7 +65,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -73,7 +73,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -89,7 +89,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj
index 1777cc1d8fd..40ab0c9e81b 100644
--- a/cpp/src/slice2py/msbuild/slice2py.vcxproj
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj
@@ -65,7 +65,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -73,7 +73,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -89,7 +89,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>ICE_STATIC_LIBS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
author	Bernard Normier <bernard@zeroc.com>	2016-05-13 12:18:43 -0400
committer	Bernard Normier <bernard@zeroc.com>	2016-05-13 12:18:43 -0400
commit	5aea2d90460e00d2505672c5a389f6f42267a156 (patch)
tree	99618f7ce47bb1b25f01559d3c91f0f47912afb7
parent	Merge remote-tracking branch 'origin/3.6' (diff)
download	ice-5aea2d90460e00d2505672c5a389f6f42267a156.tar.bz2 ice-5aea2d90460e00d2505672c5a389f6f42267a156.tar.xz ice-5aea2d90460e00d2505672c5a389f6f42267a156.zip