diff options
author | Austin Henriksen <austin@zeroc.com> | 2019-10-30 05:14:29 -0400 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2021-02-01 16:46:35 -0500 |
commit | 452f57976a135c8b72fc8d8f580d5d50618c0cae (patch) | |
tree | 0233eedd3cdc380126fd613b04b8b468beb289c0 /cpp/src/Ice | |
parent | Remove IcePatch2 (#602) (diff) | |
download | ice-452f57976a135c8b72fc8d8f580d5d50618c0cae.tar.bz2 ice-452f57976a135c8b72fc8d8f580d5d50618c0cae.tar.xz ice-452f57976a135c8b72fc8d8f580d5d50618c0cae.zip |
Remove checksum support (#607)
* Removed checksum sources from swift mapping project file.
* Removed checksum tests from Python.
* Removed checksum from Python mapping.
* Removed checksum tests from PHP mapping.
* Removed checksum support from PHP mapping.
* Removed checksum sources from MATLAB project file.
* Removed checksum option from slice2x manpages.
* Removed checksum sources from JavaScript mapping.
* Removed checksum tests from Java mapping.
* Removed outdated checksum metadata from Java mapping.
* Removed checksum support from Java mapping.
* Removed checksum tests from csharp.
* Removed checksum support from csharp mapping.
* Removed checksum tests from cpp
* Removed checksum support from IceBox.
* Removed checksum support from IceStorm.
* Removed Slice checksum support from IceGrid.
* Fixed broken filters file for Slice VS project.
* Removed checksum support from cpp mapping.
* Removed checksum support from Slice definitions.
* Removed checksum support from cpp98 mapping.
Diffstat (limited to 'cpp/src/Ice')
-rw-r--r-- | cpp/src/Ice/SliceChecksums.cpp | 75 | ||||
-rw-r--r-- | cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj | 52 | ||||
-rw-r--r-- | cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters | 32 | ||||
-rw-r--r-- | cpp/src/Ice/msbuild/ice/ice.vcxproj | 52 | ||||
-rw-r--r-- | cpp/src/Ice/msbuild/ice/ice.vcxproj.filters | 32 | ||||
-rw-r--r-- | cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj | 94 | ||||
-rw-r--r-- | cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters | 44 |
7 files changed, 6 insertions, 375 deletions
diff --git a/cpp/src/Ice/SliceChecksums.cpp b/cpp/src/Ice/SliceChecksums.cpp deleted file mode 100644 index 3bd6cf6a6ff..00000000000 --- a/cpp/src/Ice/SliceChecksums.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include <Ice/SliceChecksums.h> -#include <IceUtil/Mutex.h> -#include <IceUtil/MutexPtrLock.h> - -using namespace std; -using namespace Ice; - -namespace -{ - -SliceChecksumDict* _sliceChecksums = 0; - -IceUtil::Mutex* _mutex = 0; - -class Init -{ -public: - - Init() - { - _mutex = new IceUtil::Mutex; - } - - ~Init() - { - delete _mutex; - _mutex = 0; - } -}; - -Init init; - -class SliceChecksumDictDestroyer -{ -public: - - ~SliceChecksumDictDestroyer() - { - delete _sliceChecksums; - _sliceChecksums = 0; - } -}; - -SliceChecksumDictDestroyer destroyer; - -} - -SliceChecksumDict -Ice::sliceChecksums() -{ - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex); - if(_sliceChecksums == 0) - { - _sliceChecksums = new SliceChecksumDict(); - } - return *_sliceChecksums; -} - -IceInternal::SliceChecksumInit::SliceChecksumInit(const char* checksums[]) -{ - IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex); - if(_sliceChecksums == 0) - { - _sliceChecksums = new SliceChecksumDict(); - } - - for(int i = 0; checksums[i] != 0; i += 2) - { - _sliceChecksums->insert(SliceChecksumDict::value_type(checksums[i], checksums[i + 1])); - } -} diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj index e265b8a2b62..cbee9c217a0 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj @@ -164,7 +164,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\RouterF.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" /> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\Version.ice" /> </ItemGroup> @@ -406,12 +405,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -640,12 +633,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -874,12 +861,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1108,12 +1089,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1221,7 +1196,6 @@ <ClCompile Include="..\..\ServantManager.cpp" /> <ClCompile Include="..\..\Service.cpp" /> <ClCompile Include="..\..\SHA1.cpp" /> - <ClCompile Include="..\..\SliceChecksums.cpp" /> <ClCompile Include="..\..\SlicedData.cpp" /> <ClCompile Include="..\..\StreamSocket.cpp" /> <ClCompile Include="..\..\StringConverterPlugin.cpp" /> @@ -1464,12 +1438,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1698,12 +1666,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1932,12 +1894,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -2166,12 +2122,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -2206,4 +2156,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters index 4931502d3d0..bdaf969dabe 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj.filters @@ -198,9 +198,6 @@ <ClCompile Include="Win32\Debug\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> @@ -315,9 +312,6 @@ <ClCompile Include="x64\Debug\ServantLocatorF.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> @@ -432,9 +426,6 @@ <ClCompile Include="Win32\Release\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> @@ -549,9 +540,6 @@ <ClCompile Include="x64\Release\ServantLocatorF.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> @@ -843,9 +831,6 @@ <ClCompile Include="..\..\SHA1.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\SliceChecksums.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\SlicedData.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -1036,9 +1021,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -1153,9 +1135,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Debug\Ice\ValueFactory.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> @@ -1270,9 +1249,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Release\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> @@ -1387,9 +1363,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\Ice\ValueFactory.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> @@ -1506,9 +1479,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice"> <Filter>Slice Files</Filter> </SliceCompile> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice"> <Filter>Slice Files</Filter> </SliceCompile> @@ -1516,4 +1486,4 @@ <Filter>Slice Files</Filter> </SliceCompile> </ItemGroup> -</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 cc0f2cddb9d..a204e11119a 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj @@ -172,7 +172,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\RouterF.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" /> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\Version.ice" /> </ItemGroup> @@ -414,12 +413,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -648,12 +641,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -882,12 +869,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1116,12 +1097,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1229,7 +1204,6 @@ <ClCompile Include="..\..\ServantManager.cpp" /> <ClCompile Include="..\..\Service.cpp" /> <ClCompile Include="..\..\SHA1.cpp" /> - <ClCompile Include="..\..\SliceChecksums.cpp" /> <ClCompile Include="..\..\SlicedData.cpp" /> <ClCompile Include="..\..\StreamSocket.cpp" /> <ClCompile Include="..\..\StringConverterPlugin.cpp" /> @@ -1472,12 +1446,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1706,12 +1674,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1940,12 +1902,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -2174,12 +2130,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\SliceChecksumDict.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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -2218,4 +2168,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters index 24b7056d670..1c47655b24a 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj.filters @@ -197,9 +197,6 @@ <ClCompile Include="Win32\Debug\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> @@ -314,9 +311,6 @@ <ClCompile Include="x64\Debug\ServantLocatorF.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> @@ -431,9 +425,6 @@ <ClCompile Include="Win32\Release\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> @@ -548,9 +539,6 @@ <ClCompile Include="x64\Release\ServantLocatorF.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> @@ -842,9 +830,6 @@ <ClCompile Include="..\..\SHA1.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\SliceChecksums.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\SlicedData.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -1035,9 +1020,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -1152,9 +1134,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Debug\Ice\ValueFactory.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> @@ -1269,9 +1248,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Release\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> @@ -1386,9 +1362,6 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\Ice\ValueFactory.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> @@ -1505,9 +1478,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice"> <Filter>Slice Files</Filter> </SliceCompile> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice"> <Filter>Slice Files</Filter> </SliceCompile> @@ -1515,4 +1485,4 @@ <Filter>Slice Files</Filter> </SliceCompile> </ItemGroup> -</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 dde3576432e..70ebcef3696 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj @@ -231,7 +231,6 @@ <ClCompile Include="..\..\RouterInfo.cpp" /> <ClCompile Include="..\..\Selector.cpp" /> <ClCompile Include="..\..\ServantManager.cpp" /> - <ClCompile Include="..\..\SliceChecksums.cpp" /> <ClCompile Include="..\..\SlicedData.cpp" /> <ClCompile Include="..\..\ThreadPool.cpp" /> <ClCompile Include="..\..\TraceLevels.cpp" /> @@ -502,13 +501,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="ARM\Debug\SliceChecksumDict.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> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="ARM\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -775,13 +767,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="ARM\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="ARM\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -1048,13 +1033,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -1321,13 +1299,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -1594,13 +1565,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -1867,13 +1831,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -1926,7 +1883,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\RouterF.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocator.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice" /> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice" /> <SliceCompile Include="..\..\..\..\..\slice\Ice\Version.ice" /> </ItemGroup> @@ -2219,14 +2175,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\SliceChecksumDict.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> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -2531,14 +2479,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <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\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -2843,14 +2783,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> @@ -3155,14 +3087,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -3467,14 +3391,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -3779,14 +3695,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> <SliceCompileSource>..\..\..\..\..\slice\Ice\ServantLocatorF.ice</SliceCompileSource> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\SliceChecksumDict.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild> - <SliceCompileSource>..\..\..\..\..\slice\Ice\SliceChecksumDict.ice</SliceCompileSource> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ValueFactory.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild> @@ -3818,4 +3726,4 @@ <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.6\build\zeroc.icebuilder.msbuild.targets'))" /> </Target> -</Project>
\ No newline at end of file +</Project> 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 ddb17caf05b..d2e3a446f6d 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj.filters @@ -271,9 +271,6 @@ <ClCompile Include="..\..\ServantManager.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\SliceChecksums.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\SlicedData.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -427,9 +424,6 @@ <ClCompile Include="Win32\Debug\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> - <ClCompile Include="Win32\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> <ClCompile Include="Win32\Debug\ValueFactory.cpp"> <Filter>Source Files\Win32\Debug</Filter> </ClCompile> @@ -544,9 +538,6 @@ <ClCompile Include="ARM\Debug\ServantLocatorF.cpp"> <Filter>Source Files\ARM\Debug</Filter> </ClCompile> - <ClCompile Include="ARM\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\ARM\Debug</Filter> - </ClCompile> <ClCompile Include="ARM\Debug\ValueFactory.cpp"> <Filter>Source Files\ARM\Debug</Filter> </ClCompile> @@ -661,9 +652,6 @@ <ClCompile Include="x64\Debug\ServantLocatorF.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> - <ClCompile Include="x64\Debug\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> <ClCompile Include="x64\Debug\ValueFactory.cpp"> <Filter>Source Files\x64\Debug</Filter> </ClCompile> @@ -778,9 +766,6 @@ <ClCompile Include="Win32\Release\ServantLocatorF.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> - <ClCompile Include="Win32\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> <ClCompile Include="Win32\Release\ValueFactory.cpp"> <Filter>Source Files\Win32\Release</Filter> </ClCompile> @@ -895,9 +880,6 @@ <ClCompile Include="ARM\Release\ServantLocatorF.cpp"> <Filter>Source Files\ARM\Release</Filter> </ClCompile> - <ClCompile Include="ARM\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\ARM\Release</Filter> - </ClCompile> <ClCompile Include="ARM\Release\ValueFactory.cpp"> <Filter>Source Files\ARM\Release</Filter> </ClCompile> @@ -1012,9 +994,6 @@ <ClCompile Include="x64\Release\ServantLocatorF.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> - <ClCompile Include="x64\Release\SliceChecksumDict.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> <ClCompile Include="x64\Release\ValueFactory.cpp"> <Filter>Source Files\x64\Release</Filter> </ClCompile> @@ -1216,9 +1195,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Debug\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -1333,9 +1309,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\ARM\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\ARM\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Debug\Ice\ValueFactory.h"> <Filter>Header Files\ARM\Debug</Filter> </ClInclude> @@ -1450,9 +1423,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Debug\Ice\ValueFactory.h"> <Filter>Header Files\x64\Debug</Filter> </ClInclude> @@ -1567,9 +1537,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\Win32\Release\Ice\ValueFactory.h"> <Filter>Header Files\Win32\Release</Filter> </ClInclude> @@ -1684,9 +1651,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\ARM\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\ARM\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\ARM\Release\Ice\ValueFactory.h"> <Filter>Header Files\ARM\Release</Filter> </ClInclude> @@ -1801,9 +1765,6 @@ <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ServantLocatorF.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\SliceChecksumDict.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\uwp\x64\Release\Ice\ValueFactory.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> @@ -1920,9 +1881,6 @@ <SliceCompile Include="..\..\..\..\..\slice\Ice\ServantLocatorF.ice"> <Filter>Slice Files</Filter> </SliceCompile> - <SliceCompile Include="..\..\..\..\..\slice\Ice\SliceChecksumDict.ice"> - <Filter>Slice Files</Filter> - </SliceCompile> <SliceCompile Include="..\..\..\..\..\slice\Ice\ValueFactory.ice"> <Filter>Slice Files</Filter> </SliceCompile> @@ -1933,4 +1891,4 @@ <ItemGroup> <None Include="packages.config" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> |