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 | |
| 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')
42 files changed, 45 insertions, 1750 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> diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index da85420c93c..eef5f77850e 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -3,7 +3,6 @@ // #include <Ice/Ice.h> -#include <Ice/SliceChecksums.h> #include <Ice/ConsoleUtil.h> #include <IceUtil/Options.h> #include <IceBox/IceBox.h> diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 759acdb0637..41990589519 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -7,7 +7,6 @@ #include <Ice/Ice.h> #include <Ice/ConsoleUtil.h> #include <Ice/DynamicLibrary.h> -#include <Ice/SliceChecksums.h> #include <Ice/Initialize.h> #include <Ice/Instance.h> #include <IceBox/ServiceManagerI.h> @@ -115,12 +114,6 @@ IceBox::ServiceManagerI::~ServiceManagerI() { } -SliceChecksumDict -IceBox::ServiceManagerI::getSliceChecksums(const Current&) const -{ - return sliceChecksums(); -} - void IceBox::ServiceManagerI::startService(ICE_IN(string) name, const Current&) { diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h index a307c050dfc..8cfe134fae1 100644 --- a/cpp/src/IceBox/ServiceManagerI.h +++ b/cpp/src/IceBox/ServiceManagerI.h @@ -25,8 +25,6 @@ public: ServiceManagerI(Ice::CommunicatorPtr, int&, char*[]); virtual ~ServiceManagerI(); - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const; - virtual void startService(ICE_IN(std::string), const ::Ice::Current&); virtual void stopService(ICE_IN(std::string), const ::Ice::Current&); diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 3596852add6..3c27f0a119f 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -7,7 +7,6 @@ #include <Ice/Ice.h> #include <Ice/LoggerUtil.h> #include <Ice/TraceUtil.h> -#include <Ice/SliceChecksums.h> #include <IceGrid/AdminI.h> #include <IceGrid/RegistryI.h> @@ -794,12 +793,6 @@ AdminI::shutdown(const Current&) _registry->shutdown(); } -SliceChecksumDict -AdminI::getSliceChecksums(const Current&) const -{ - return sliceChecksums(); -} - void AdminI::checkIsReadOnly() const { diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h index 6ae5e4cd74c..ac294ae0445 100644 --- a/cpp/src/IceGrid/AdminI.h +++ b/cpp/src/IceGrid/AdminI.h @@ -82,8 +82,6 @@ public: virtual void shutdown(const Ice::Current&); - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const; - private: void checkIsReadOnly() const; diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index df817c3e6d7..627cb87e95d 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -11,7 +11,6 @@ #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> #include <Ice/Ice.h> -#include <Ice/SliceChecksums.h> #include <IceGrid/Parser.h> #include <IceGrid/FileParserI.h> #include <IceGrid/Registry.h> diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp index 22c6ed1ac09..8307b04eb6a 100644 --- a/cpp/src/IceStorm/Admin.cpp +++ b/cpp/src/IceStorm/Admin.cpp @@ -5,7 +5,6 @@ #include <IceUtil/Options.h> #include <Ice/Ice.h> #include <Ice/ConsoleUtil.h> -#include <Ice/SliceChecksums.h> #include <IceStorm/Parser.h> #ifdef _WIN32 diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 74a64a2198a..194a896a934 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -10,7 +10,6 @@ #include <IceStorm/Observers.h> #include <IceStorm/Subscriber.h> #include <IceStorm/Util.h> -#include <Ice/SliceChecksums.h> #include <functional> @@ -83,12 +82,6 @@ public: return _impl->retrieveAll(); } - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const - { - // This doesn't require the replication to be running. - return Ice::sliceChecksums(); - } - virtual NodePrx getReplicaNode(const Ice::Current&) const { // This doesn't require the replication to be running. diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp index 56cc3d37f17..016808d9335 100644 --- a/cpp/src/IceStorm/TransientTopicManagerI.cpp +++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp @@ -10,8 +10,6 @@ #include <Ice/Ice.h> -#include <Ice/SliceChecksums.h> - #include <functional> using namespace IceStorm; @@ -106,11 +104,6 @@ TransientTopicManagerImpl::retrieveAll(const Ice::Current&) const return all; } -Ice::SliceChecksumDict -TransientTopicManagerImpl::getSliceChecksums(const Ice::Current&) const -{ - return Ice::sliceChecksums(); -} IceStormElection::NodePrx TransientTopicManagerImpl::getReplicaNode(const Ice::Current&) const diff --git a/cpp/src/IceStorm/TransientTopicManagerI.h b/cpp/src/IceStorm/TransientTopicManagerI.h index 4051a941327..8c84b6d85d5 100644 --- a/cpp/src/IceStorm/TransientTopicManagerI.h +++ b/cpp/src/IceStorm/TransientTopicManagerI.h @@ -33,7 +33,6 @@ public: virtual TopicPrx create(const std::string&, const Ice::Current&); virtual TopicPrx retrieve(const std::string&, const Ice::Current&) const; virtual TopicDict retrieveAll(const Ice::Current&) const; - virtual Ice::SliceChecksumDict getSliceChecksums(const Ice::Current&) const; virtual IceStormElection::NodePrx getReplicaNode(const Ice::Current&) const; void reap(); diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp deleted file mode 100644 index 98aa11291d8..00000000000 --- a/cpp/src/Slice/Checksum.cpp +++ /dev/null @@ -1,447 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#include <Slice/Checksum.h> -#include <Slice/MD5.h> -#include <IceUtil/OutputUtil.h> - -using namespace std; -using namespace Slice; - -namespace Slice -{ - -class ChecksumVisitor : public ParserVisitor -{ -public: - - ChecksumVisitor(ChecksumMap&); - - virtual bool visitClassDefStart(const ClassDefPtr&); - virtual bool visitExceptionStart(const ExceptionPtr&); - virtual bool visitStructStart(const StructPtr&); - virtual void visitSequence(const SequencePtr&); - virtual void visitDictionary(const DictionaryPtr&); - virtual void visitEnum(const EnumPtr&); - virtual void visitConst(const ConstPtr&); - -private: - - string typeToString(const TypePtr&); - void updateMap(const string&, const string&); - - ChecksumMap& _map; -}; - -} - -Slice::ChecksumVisitor::ChecksumVisitor(ChecksumMap& m) : - _map(m) -{ -} - -bool -Slice::ChecksumVisitor::visitClassDefStart(const ClassDefPtr& p) -{ - if(p->isLocal()) - { - return false; - } - - ClassList bases = p->bases(); - - ostringstream ostr; - - if(p->isInterface()) - { - ostr << "interface "; - } - else - { - ostr << "class "; - } - - ostr << p->name(); - - if(p->compactId() >= 0) - { - ostr << '(' << p->compactId() << ')'; - } - - if(!bases.empty()) - { - if(!bases.front()->isInterface()) - { - ostr << " extends " << bases.front()->scoped(); - bases.erase(bases.begin()); - } - if(!bases.empty()) - { - if(p->isInterface()) - { - ostr << " extends "; - } - else - { - ostr << " implements "; - } - for(ClassList::iterator q = bases.begin(); q != bases.end(); ++q) - { - if(q != bases.begin()) - { - ostr << ", "; - } - ostr << (*q)->scoped(); - } - } - } - ostr << endl; - - if(p->hasDataMembers()) - { - DataMemberList members = p->dataMembers(); - DataMemberList optionals; - for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q) - { - if((*q)->optional()) - { - optionals.push_back(*q); - } - else - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl; - } - } - - if(!optionals.empty()) - { - // - // Sort optional parameters by tag. - // - class SortFn - { - public: - static bool compare(const DataMemberPtr& lhs, const DataMemberPtr& rhs) - { - return lhs->tag() < rhs->tag(); - } - }; - optionals.sort(SortFn::compare); - - for(DataMemberList::iterator q = optionals.begin(); q != optionals.end(); ++q) - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->tag() << ' ' << (*q)->name(); - } - } - } - - if(p->hasOperations()) - { - OperationList ops = p->operations(); - for(OperationList::iterator q = ops.begin(); q != ops.end(); ++q) - { - ostr << typeToString((*q)->returnType()) << ' '; - if((*q)->returnIsOptional()) - { - ostr << (*q)->returnTag() << ' '; - } - ostr << (*q)->name() << '('; - ParamDeclList params = (*q)->parameters(); - ParamDeclList optionals; - for(ParamDeclList::iterator r = params.begin(); r != params.end(); ++r) - { - if((*r)->optional()) - { - optionals.push_back(*r); - } - else - { - if(r != params.begin()) - { - ostr << ", "; - } - if((*r)->isOutParam()) - { - ostr << "out "; - } - ostr << typeToString((*r)->type()) << ' ' << (*r)->name(); - } - } - - if(!optionals.empty()) - { - // - // Sort optional parameters by tag. - // - class SortFn - { - public: - static bool compare(const ParamDeclPtr& lhs, const ParamDeclPtr& rhs) - { - return lhs->tag() < rhs->tag(); - } - }; - optionals.sort(SortFn::compare); - - for(ParamDeclList::iterator r = optionals.begin(); r != optionals.end(); ++r) - { - if(r != optionals.begin() || params.size() > optionals.size()) - { - ostr << ", "; - } - if((*r)->isOutParam()) - { - ostr << "out "; - } - ostr << typeToString((*r)->type()) << ' ' << (*r)->tag() << ' ' << (*r)->name(); - } - } - - ostr << ')'; - ExceptionList ex = (*q)->throws(); - if(!ex.empty()) - { - ostr << " throws "; - for(ExceptionList::iterator s = ex.begin(); s != ex.end(); ++s) - { - if(s != ex.begin()) - { - ostr << ", "; - } - ostr << (*s)->scoped(); - } - } - ostr << endl; - } - } - - updateMap(p->scoped(), ostr.str()); - - return false; -} - -bool -Slice::ChecksumVisitor::visitExceptionStart(const ExceptionPtr& p) -{ - if(p->isLocal()) - { - return false; - } - - ExceptionPtr base = p->base(); - - ostringstream ostr; - - ostr << "exception " << p->name(); - if(base) - { - ostr << " extends " << base->scoped(); - } - ostr << endl; - - DataMemberList members = p->dataMembers(); - DataMemberList optionals; - for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q) - { - if((*q)->optional()) - { - optionals.push_back(*q); - } - else - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl; - } - } - - if(!optionals.empty()) - { - // - // Sort optional parameters by tag. - // - class SortFn - { - public: - static bool compare(const DataMemberPtr& lhs, const DataMemberPtr& rhs) - { - return lhs->tag() < rhs->tag(); - } - }; - optionals.sort(SortFn::compare); - - for(DataMemberList::iterator q = optionals.begin(); q != optionals.end(); ++q) - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->tag() << ' ' << (*q)->name(); - } - } - - updateMap(p->scoped(), ostr.str()); - - return false; -} - -bool -Slice::ChecksumVisitor::visitStructStart(const StructPtr& p) -{ - if(p->isLocal()) - { - return false; - } - - ostringstream ostr; - - ostr << "struct " << p->name() << endl; - - DataMemberList members = p->dataMembers(); - for(DataMemberList::iterator q = members.begin(); q != members.end(); ++q) - { - ostr << typeToString((*q)->type()) << ' ' << (*q)->name() << endl; - } - - updateMap(p->scoped(), ostr.str()); - - return false; -} - -void -Slice::ChecksumVisitor::visitSequence(const SequencePtr& p) -{ - if(p->isLocal()) - { - return; - } - - ostringstream ostr; - ostr << "sequence<" << typeToString(p->type()) << "> " << p->name() << endl; - updateMap(p->scoped(), ostr.str()); -} - -void -Slice::ChecksumVisitor::visitDictionary(const DictionaryPtr& p) -{ - if(p->isLocal()) - { - return; - } - - ostringstream ostr; - ostr << "dictionary<" << typeToString(p->keyType()) << ", " << typeToString(p->valueType()) << "> " << p->name() - << endl; - updateMap(p->scoped(), ostr.str()); -} - -void -Slice::ChecksumVisitor::visitEnum(const EnumPtr& p) -{ - if(p->isLocal()) - { - return; - } - - ostringstream ostr; - - ostr << "enum " << p->name() << endl; - - // - // Check if any of the enumerators were assigned an explicit value. - // - const bool explicitValue = p->explicitValue(); - - EnumeratorList enums = p->enumerators(); - if(explicitValue) - { - // - // Sort enumerators by value. - // - class SortFn - { - public: - static bool compare(const EnumeratorPtr& lhs, const EnumeratorPtr& rhs) - { - return lhs->value() < rhs->value(); - } - }; - enums.sort(SortFn::compare); - for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q) - { - ostr << (*q)->name() << ' ' << IceUtilInternal::int64ToString((*q)->value()) << endl; - } - } - else - { - for(EnumeratorList::iterator q = enums.begin(); q != enums.end(); ++q) - { - ostr << (*q)->name() << endl; - } - } - updateMap(p->scoped(), ostr.str()); -} - -void -Slice::ChecksumVisitor::visitConst(const ConstPtr& p) -{ - ostringstream ostr; - ostr << "const " << typeToString(p->type()) << ' ' << p->name() << " = " << p->value() << endl; - updateMap(p->scoped(), ostr.str()); -} - -string -Slice::ChecksumVisitor::typeToString(const TypePtr& type) -{ - static const char* builtinTable[] = - { - "byte", - "boolean", - "short", - "int", - "long", - "float", - "double", - "string", - "Object", - "Object*", - "LocalObject" - }; - - if(!type) - { - return "void"; - } - - BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); - if(builtin) - { - return builtinTable[builtin->kind()]; - } - - ProxyPtr proxy = ProxyPtr::dynamicCast(type); - if(proxy) - { - return proxy->_class()->scoped() + "*"; - } - - ContainedPtr cont = ContainedPtr::dynamicCast(type); - assert(cont); - return cont->scoped(); -} - -void -Slice::ChecksumVisitor::updateMap(const string& scoped, const string& data) -{ - MD5 md5(reinterpret_cast<const unsigned char*>(data.c_str()), static_cast<int>(data.size())); - vector<unsigned char> bytes; - bytes.resize(16); - md5.getDigest(reinterpret_cast<unsigned char*>(&bytes[0])); - _map.insert(ChecksumMap::value_type(scoped, bytes)); -} - -Slice::ChecksumMap -Slice::createChecksums(const UnitPtr& u) -{ - ChecksumMap result; - - ChecksumVisitor visitor(result); - u->visit(&visitor, false); - - return result; -} diff --git a/cpp/src/Slice/Checksum.h b/cpp/src/Slice/Checksum.h deleted file mode 100644 index 8be4395b12b..00000000000 --- a/cpp/src/Slice/Checksum.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (c) ZeroC, Inc. All rights reserved. -// - -#ifndef SLICE_CHECKSUM_H -#define SLICE_CHECKSUM_H - -#include <Slice/Parser.h> -#include <map> -#include <vector> - -namespace Slice -{ - -typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap; - -ChecksumMap createChecksums(const UnitPtr&); - -} - -#endif diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 51b2a512181..af6d4e474b1 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -155,15 +155,10 @@ public: if(s.find(prefix) == 0) { static const string packagePrefix = "java:package:"; - static const string checksumPrefix = "java:checksum:"; if(s.find(packagePrefix) == 0 && s.size() > packagePrefix.size()) { continue; } - else if(s.find(checksumPrefix) == 0 && s.size() > checksumPrefix.size()) - { - continue; - } else { dc->warning(InvalidMetaData, file, "", "ignoring invalid file metadata `" + s + "'"); diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp index 524c9831d0d..ae18777520f 100644 --- a/cpp/src/Slice/Python.cpp +++ b/cpp/src/Slice/Python.cpp @@ -453,7 +453,6 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "--all Generate code for Slice definitions in included files.\n" - "--checksum Generate checksums for Slice definitions.\n" "--prefix PREFIX Prepend filenames of Python modules with PREFIX.\n" ; } @@ -480,7 +479,6 @@ Slice::Python::compile(const vector<string>& argv) opts.addOpt("", "all"); opts.addOpt("", "no-package"); opts.addOpt("", "build-package"); - opts.addOpt("", "checksum"); opts.addOpt("", "prefix", IceUtilInternal::Options::NeedArg); vector<string> args; @@ -548,8 +546,6 @@ Slice::Python::compile(const vector<string>& argv) bool buildPackage = opts.isSet("build-package"); - bool checksum = opts.isSet("checksum"); - string prefix = opts.optArg("prefix"); if(args.empty()) @@ -761,7 +757,7 @@ Slice::Python::compile(const vector<string>& argv) // // Generate Python code. // - generate(u, all, checksum, includePaths, out); + generate(u, all, includePaths, out); out.close(); } diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 5649f9797d4..650cc18ac72 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -3,7 +3,6 @@ // #include <Slice/PythonUtil.h> -#include <Slice/Checksum.h> #include <Slice/Util.h> #include <IceUtil/IceUtil.h> #include <IceUtil/StringUtil.h> @@ -2917,7 +2916,7 @@ Slice::Python::getImportFileName(const string& file, const UnitPtr& ut, const ve } void -Slice::Python::generate(const UnitPtr& un, bool all, bool checksum, const vector<string>& includePaths, +Slice::Python::generate(const UnitPtr& un, bool all, const vector<string>& includePaths, Output& out) { Slice::Python::MetaDataVisitor visitor; @@ -2949,27 +2948,6 @@ Slice::Python::generate(const UnitPtr& un, bool all, bool checksum, const vector CodeVisitor codeVisitor(out, moduleHistory); un->visit(&codeVisitor, false); - if(checksum) - { - ChecksumMap checksums = createChecksums(un); - if(!checksums.empty()) - { - out << sp; - for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end(); ++p) - { - out << nl << "Ice.sliceChecksums[\"" << p->first << "\"] = \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\""; - } - } - } - out << nl; // Trailing newline. } diff --git a/cpp/src/Slice/PythonUtil.h b/cpp/src/Slice/PythonUtil.h index d1b0d656906..137d3ee61cb 100644 --- a/cpp/src/Slice/PythonUtil.h +++ b/cpp/src/Slice/PythonUtil.h @@ -27,7 +27,7 @@ std::string getImportFileName(const std::string&, const Slice::UnitPtr&, const s // // Generate Python code for a translation unit. // -void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&); +void generate(const Slice::UnitPtr&, bool, const std::vector<std::string>&, IceUtilInternal::Output&); // // Convert a scoped name into a Python name. diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/Slice/Ruby.cpp index ff9f46730eb..d13d0140330 100644 --- a/cpp/src/Slice/Ruby.cpp +++ b/cpp/src/Slice/Ruby.cpp @@ -71,7 +71,6 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "--all Generate code for Slice definitions in included files.\n" - "--checksum Generate checksums for Slice definitions.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" "--underscore Allow underscores in Slice identifiers\n" @@ -99,7 +98,6 @@ Slice::Ruby::compile(const vector<string>& argv) opts.addOpt("", "ice"); opts.addOpt("", "underscore"); opts.addOpt("", "all"); - opts.addOpt("", "checksum"); vector<string> args; try @@ -162,8 +160,6 @@ Slice::Ruby::compile(const vector<string>& argv) bool all = opts.isSet("all"); - bool checksum = opts.isSet("checksum"); - if(args.empty()) { consoleErr << argv[0] << ": error: no input file" << endl; @@ -306,7 +302,7 @@ Slice::Ruby::compile(const vector<string>& argv) // // Generate the Ruby mapping. // - generate(u, all, checksum, includePaths, out); + generate(u, all, includePaths, out); out.close(); } diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index af1f273ac6d..39d6a594d0e 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -3,7 +3,6 @@ // #include <Slice/RubyUtil.h> -#include <Slice/Checksum.h> #include <Slice/Util.h> #include <IceUtil/Functional.h> #include <IceUtil/InputUtil.h> @@ -1434,7 +1433,7 @@ Slice::Ruby::CodeVisitor::collectExceptionMembers(const ExceptionPtr& p, MemberI } void -Slice::Ruby::generate(const UnitPtr& un, bool all, bool checksum, const vector<string>& includePaths, Output& out) +Slice::Ruby::generate(const UnitPtr& un, bool all, const vector<string>& includePaths, Output& out) { out << nl << "require 'Ice'"; @@ -1457,27 +1456,6 @@ Slice::Ruby::generate(const UnitPtr& un, bool all, bool checksum, const vector<s CodeVisitor codeVisitor(out); un->visit(&codeVisitor, false); - if(checksum) - { - ChecksumMap checksums = createChecksums(un); - if(!checksums.empty()) - { - out << sp; - for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end(); ++p) - { - out << nl << "::Ice::SliceChecksums[\"" << p->first << "\"] = \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\""; - } - } - } - out << nl; // Trailing newline. } diff --git a/cpp/src/Slice/RubyUtil.h b/cpp/src/Slice/RubyUtil.h index f5fb4413f68..829abee438e 100644 --- a/cpp/src/Slice/RubyUtil.h +++ b/cpp/src/Slice/RubyUtil.h @@ -16,7 +16,7 @@ namespace Ruby // // Generate Ruby code for a translation unit. // -void generate(const Slice::UnitPtr&, bool, bool, const std::vector<std::string>&, IceUtilInternal::Output&); +void generate(const Slice::UnitPtr&, bool, const std::vector<std::string>&, IceUtilInternal::Output&); // // Check the given identifier against Ruby's list of reserved words. If it matches diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj index c4cb45aa4ad..88a167a5fd9 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj +++ b/cpp/src/Slice/msbuild/slice.vcxproj @@ -90,7 +90,6 @@ </ClCompile> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\Checksum.cpp" /> <ClCompile Include="..\CPlusPlusUtil.cpp" /> <ClCompile Include="..\FileTracker.cpp" /> <ClCompile Include="..\Grammar.cpp" /> @@ -109,7 +108,6 @@ <ClCompile Include="..\StringLiteralUtil.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\Checksum.h" /> <ClInclude Include="..\CPlusPlusUtil.h" /> <ClInclude Include="..\FileTracker.h" /> <ClInclude Include="..\Grammar.h" /> diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters index dfec8f19d1c..1ff90b18d95 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj.filters +++ b/cpp/src/Slice/msbuild/slice.vcxproj.filters @@ -15,554 +15,94 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\CPlusPlusUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\FileTracker.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Grammar.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\JavaUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\MD5.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\MD5I.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Parser.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\PHPUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Preprocessor.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Python.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\PythonUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Ruby.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\RubyUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\Scanner.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\SliceUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> + <ClCompile Include="..\StringLiteralUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> - <ClCompile Include="..\Checksum.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\CPlusPlusUtil.cpp" /> - <ClCompile Include="..\FileTracker.cpp" /> - <ClCompile Include="..\Grammar.cpp" /> - <ClCompile Include="..\JavaUtil.cpp" /> - <ClCompile Include="..\MD5.cpp" /> - <ClCompile Include="..\MD5I.cpp" /> - <ClCompile Include="..\Parser.cpp" /> - <ClCompile Include="..\PHPUtil.cpp" /> - <ClCompile Include="..\Preprocessor.cpp" /> - <ClCompile Include="..\Python.cpp" /> - <ClCompile Include="..\PythonUtil.cpp" /> - <ClCompile Include="..\Ruby.cpp" /> - <ClCompile Include="..\RubyUtil.cpp" /> - <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\SliceUtil.cpp" /> - <ClCompile Include="..\StringLiteralUtil.cpp" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\Checksum.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\CPlusPlusUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\FileTracker.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\Grammar.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\GrammarUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\JavaUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\MD5.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\MD5I.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\Parser.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\PHPUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\Preprocessor.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\PythonUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\RubyUtil.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> - <ClInclude Include="..\Checksum.h"> + <ClInclude Include="..\Util.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\CPlusPlusUtil.h" /> - <ClInclude Include="..\FileTracker.h" /> - <ClInclude Include="..\Grammar.h" /> - <ClInclude Include="..\GrammarUtil.h" /> - <ClInclude Include="..\JavaUtil.h" /> - <ClInclude Include="..\MD5.h" /> - <ClInclude Include="..\MD5I.h" /> - <ClInclude Include="..\Parser.h" /> - <ClInclude Include="..\PHPUtil.h" /> - <ClInclude Include="..\Preprocessor.h" /> - <ClInclude Include="..\PythonUtil.h" /> - <ClInclude Include="..\RubyUtil.h" /> - <ClInclude Include="..\Util.h" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index fdabfd205e0..101512a6b09 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -8,7 +8,6 @@ #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> #include <IceUtil/StringUtil.h> -#include <Slice/Checksum.h> #include <Slice/FileTracker.h> #include <IceUtil/FileUtil.h> @@ -661,7 +660,7 @@ emitOpNameResult(IceUtilInternal::Output& H, const OperationPtr& p, int useWstri Slice::Gen::Gen(const string& base, const string& headerExtension, const string& sourceExtension, const vector<string>& extraHeaders, const string& include, const vector<string>& includePaths, const string& dllExport, const string& dir, - bool implCpp98, bool implCpp11, bool checksum, bool ice) : + bool implCpp98, bool implCpp11, bool ice) : _base(base), _headerExtension(headerExtension), _implHeaderExtension(headerExtension), @@ -673,7 +672,6 @@ Slice::Gen::Gen(const string& base, const string& headerExtension, const string& _dir(dir), _implCpp98(implCpp98), _implCpp11(implCpp11), - _checksum(checksum), _ice(ice) { for(vector<string>::iterator p = _includePaths.begin(); p != _includePaths.end(); ++p) @@ -702,38 +700,6 @@ Slice::Gen::~Gen() } void -Slice::Gen::generateChecksumMap(const UnitPtr& p) -{ - if(_checksum) - { - ChecksumMap map = createChecksums(p); - if(!map.empty()) - { - C << sp << nl << "namespace"; - C << nl << "{"; - C << sp << nl << "const char* iceSliceChecksums[] ="; - C << sb; - for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q) - { - C << nl << "\"" << q->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator r = q->second.begin(); r != q->second.end(); ++r) - { - str << static_cast<int>(*r); - } - C << str.str() << "\","; - } - C << nl << "0"; - C << eb << ';'; - C << nl << "const IceInternal::SliceChecksumInit iceSliceChecksumInit(iceSliceChecksums);"; - C << sp << nl << "}"; - } - } -} - -void Slice::Gen::generate(const UnitPtr& p) { string file = p->topLevelFile(); @@ -944,11 +910,6 @@ Slice::Gen::generate(const UnitPtr& p) C << "\n#include <Ice/SlicedData.h>"; } - if(_checksum) - { - C << "\n#include <Ice/SliceChecksums.h>"; - } - C << "\n#include <IceUtil/PopDisableWarnings.h>"; StringList includes = p->includeFiles(); @@ -1088,8 +1049,6 @@ Slice::Gen::generate(const UnitPtr& p) Cpp11CompatibilityVisitor compatibilityVisitor(H, C, _dllExport); p->visit(&compatibilityVisitor, false); - - generateChecksumMap(p); } H << sp; H.zeroIndent(); @@ -1165,8 +1124,6 @@ Slice::Gen::generate(const UnitPtr& p) ImplVisitor implVisitor(implH, implC, _dllExport); p->visit(&implVisitor, false); } - - generateChecksumMap(p); } H << sp; diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index b9cae63c035..01a57f0c50f 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -25,12 +25,10 @@ public: const std::string&, bool, bool, - bool, bool); ~Gen(); void generate(const UnitPtr&); - void generateChecksumMap(const UnitPtr&); void closeOutput(); static int setUseWstring(ContainedPtr, std::list<int>&, int); @@ -69,7 +67,6 @@ private: std::string _dir; bool _implCpp98; bool _implCpp11; - bool _checksum; bool _ice; class TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index fe5a95aa995..734f5ed3092 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -76,7 +76,6 @@ usage(const string& n) "--include-dir DIR Use DIR as the header include directory in source files.\n" "--impl-c++11 Generate sample implementations for C++11 mapping.\n" "--impl-c++98 Generate sample implementations for C++98 mapping.\n" - "--checksum Generate checksums for Slice definitions.\n" "--dll-export SYMBOL Use SYMBOL for DLL exports\n" " deprecated: use instead [[\"cpp:dll-export:SYMBOL\"]] metadata.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" @@ -111,7 +110,6 @@ compile(const vector<string>& argv) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum"); bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end(); vector<string> args; @@ -190,8 +188,6 @@ compile(const vector<string>& argv) bool underscore = opts.isSet("underscore"); - bool checksum = opts.isSet("checksum"); - if(args.empty()) { consoleErr << argv[0] << ": error: no input file" << endl; @@ -335,7 +331,7 @@ compile(const vector<string>& argv) try { Gen gen(icecpp->getBaseName(), headerExtension, sourceExtension, extraHeaders, include, - includePaths, dllExport, output, implCpp98, implCpp11, checksum, ice); + includePaths, dllExport, output, implCpp98, implCpp11, ice); gen.generate(u); } catch(const Slice::FileException& ex) diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index cbe3518cb94..2ba18346a34 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -16,7 +16,6 @@ #include <IceUtil/Iterator.h> #include <IceUtil/UUID.h> -#include <Slice/Checksum.h> #include <Slice/FileTracker.h> #include <Slice/Util.h> #include <DotNetNames.h> @@ -2066,51 +2065,6 @@ Slice::Gen::generateImplTie(const UnitPtr& p) } void -Slice::Gen::generateChecksums(const UnitPtr& u) -{ - ChecksumMap map = createChecksums(u); - if(!map.empty()) - { - string className = "X" + generateUUID(); - for(string::size_type pos = 1; pos < className.size(); ++pos) - { - if(!isalnum(static_cast<unsigned char>(className[pos]))) - { - className[pos] = '_'; - } - } - - _out << sp << nl << "namespace IceInternal"; - _out << sb; - _out << nl << "namespace SliceChecksums"; - _out << sb; - _out << nl << "[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"slice2cs\", \"" << ICE_STRING_VERSION - << "\")]"; - _out << nl << "public sealed class " << className; - _out << sb; - _out << nl << "public static global::System.Collections.Hashtable map = new global::System.Collections.Hashtable();"; - _out << sp << nl << "static " << className << "()"; - _out << sb; - for(ChecksumMap::const_iterator p = map.begin(); p != map.end(); ++p) - { - _out << nl << "map.Add(\"" << p->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - _out << str.str() << "\");"; - } - _out << eb; - _out << eb << ';'; - _out << eb; - _out << eb; - } -} - -void Slice::Gen::closeOutput() { _out.close(); diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index 202998ea4ae..7bc78355a64 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -90,7 +90,6 @@ public: void generate(const UnitPtr&); void generateImpl(const UnitPtr&); void generateImplTie(const UnitPtr&); - void generateChecksums(const UnitPtr&); void closeOutput(); private: diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp index a3826690354..0b01a6271ed 100644 --- a/cpp/src/slice2cs/Main.cpp +++ b/cpp/src/slice2cs/Main.cpp @@ -72,7 +72,6 @@ usage(const string& n) "--tie Generate tie classes.\n" "--impl Generate sample implementations.\n" "--impl-tie Generate sample tie implementations.\n" - "--checksum Generate checksums for Slice definitions.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" "--underscore Allow underscores in Slice identifiers\n" @@ -101,7 +100,6 @@ compile(const vector<string>& argv) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum"); bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end(); vector<string> args; @@ -172,8 +170,6 @@ compile(const vector<string>& argv) bool underscore = opts.isSet("underscore"); - bool checksum = opts.isSet("checksum"); - if(args.empty()) { consoleErr << argv[0] << ": error: no input file" << endl; @@ -314,10 +310,6 @@ compile(const vector<string>& argv) { gen.generateImplTie(p); } - if(checksum) - { - gen.generateChecksums(p); - } } catch(const Slice::FileException& ex) { diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 160ab5c238d..41299779644 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -3,7 +3,6 @@ // #include <Gen.h> -#include <Slice/Checksum.h> #include <Slice/Util.h> #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> @@ -2277,63 +2276,6 @@ Slice::Gen::generateImpl(const UnitPtr& p) p->visit(&implVisitor, false); } -void -Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m) -{ - // - // Attempt to open the source file for the checksum class. - // - JavaOutput out; - out.openClass(checksumClass, dir); - - // - // Get the class name. - // - string className; - string::size_type pos = checksumClass.rfind('.'); - if(pos == string::npos) - { - className = checksumClass; - } - else - { - className = checksumClass.substr(pos + 1); - } - - // - // Emit the class. - // - out << sp; - out << nl << "/** @hidden */"; - out << nl << "public class " << className; - out << sb; - - // - // Use a static initializer to populate the checksum map. - // - out << sp << nl << "public static final java.util.Map<String, String> checksums;"; - out << sp << nl << "static"; - out << sb; - out << nl << "java.util.Map<String, String> map = new java.util.HashMap<>();"; - for(ChecksumMap::const_iterator p = m.begin(); p != m.end(); ++p) - { - out << nl << "map.put(\"" << p->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\");"; - } - out << nl << "checksums = java.util.Collections.unmodifiableMap(map);"; - - out << eb; - out << eb; - out << nl; -} - Slice::Gen::PackageVisitor::PackageVisitor(const string& dir) : JavaVisitor(dir) { diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h index d9e286d1ad9..4a44bfff6c4 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -7,7 +7,6 @@ #include <Slice/Parser.h> #include <Slice/JavaUtil.h> -#include <Slice/Checksum.h> namespace Slice { @@ -121,8 +120,6 @@ public: void generate(const UnitPtr&); void generateImpl(const UnitPtr&); - static void writeChecksumClass(const std::string&, const std::string&, const ChecksumMap&); - private: std::string _base; diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index 0f390f01057..d3578fca4ca 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -3,7 +3,6 @@ // #include <GenCompat.h> -#include <Slice/Checksum.h> #include <Slice/Util.h> #include <IceUtil/Functional.h> #include <IceUtil/Iterator.h> @@ -2440,61 +2439,6 @@ Slice::GenCompat::generateImplTie(const UnitPtr& p) p->visit(&implTieVisitor, false); } -void -Slice::GenCompat::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m) -{ - // - // Attempt to open the source file for the checksum class. - // - JavaOutput out; - out.openClass(checksumClass, dir); - - // - // Get the class name. - // - string className; - string::size_type pos = checksumClass.rfind('.'); - if(pos == string::npos) - { - className = checksumClass; - } - else - { - className = checksumClass.substr(pos + 1); - } - - // - // Emit the class. - // - out << sp << nl << "public class " << className; - out << sb; - - // - // Use a static initializer to populate the checksum map. - // - out << sp << nl << "public static final java.util.Map<String, String> checksums;"; - out << sp << nl << "static"; - out << sb; - out << nl << "java.util.Map<String, String> map = new java.util.HashMap<String, String>();"; - for(ChecksumMap::const_iterator p = m.begin(); p != m.end(); ++p) - { - out << nl << "map.put(\"" << p->first << "\", \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\");"; - } - out << nl << "checksums = java.util.Collections.unmodifiableMap(map);"; - - out << eb; - out << eb; - out << nl; -} - Slice::GenCompat::OpsVisitor::OpsVisitor(const string& dir) : JavaCompatVisitor(dir) { diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h index 8000f941d0d..4d10bb9c9ef 100644 --- a/cpp/src/slice2java/GenCompat.h +++ b/cpp/src/slice2java/GenCompat.h @@ -7,7 +7,6 @@ #include <Slice/Parser.h> #include <Slice/JavaUtil.h> -#include <Slice/Checksum.h> namespace Slice { @@ -133,8 +132,6 @@ public: void generateImpl(const UnitPtr&); void generateImplTie(const UnitPtr&); - static void writeChecksumClass(const std::string&, const std::string&, const ChecksumMap&); - private: std::string _base; diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index a62eb17ed25..2474e0bded0 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -75,7 +75,6 @@ usage(const string& n) "--tie Generate tie classes. (Java Compat Only)\n" "--impl Generate sample implementations.\n" "--impl-tie Generate sample tie implementations. (Java Compat Only)\n" - "--checksum CLASS Generate checksums for Slice definitions into CLASS.\n" "--meta META Define file metadata directive META.\n" "--list-generated Emit list of generated files in XML format.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" @@ -107,7 +106,6 @@ compile(const vector<string>& argv) opts.addOpt("d", "debug"); opts.addOpt("", "ice"); opts.addOpt("", "underscore"); - opts.addOpt("", "checksum", IceUtilInternal::Options::NeedArg); opts.addOpt("", "meta", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); opts.addOpt("", "compat"); @@ -178,8 +176,6 @@ compile(const vector<string>& argv) bool underscore = opts.isSet("underscore"); - string checksumClass = opts.optArg("checksum"); - bool listGenerated = opts.isSet("list-generated"); StringList globalMetadata; @@ -235,8 +231,6 @@ compile(const vector<string>& argv) int status = EXIT_SUCCESS; - ChecksumMap checksums; - IceUtil::CtrlCHandler ctrlCHandler; ctrlCHandler.setCallback(interruptedCallback); @@ -366,15 +360,6 @@ compile(const vector<string>& argv) gen.generateImpl(p); } } - - if(!checksumClass.empty()) - { - // - // Calculate checksums for the Slice definitions in the unit. - // - ChecksumMap m = createChecksums(p); - copy(m.begin(), m.end(), inserter(checksums, checksums.begin())); - } } catch(const Slice::FileException& ex) { @@ -417,23 +402,6 @@ compile(const vector<string>& argv) writeDependencies(os.str(), dependFile); } - if(status == EXIT_SUCCESS && !checksumClass.empty() && !dependxml) - { - try - { - Gen::writeChecksumClass(checksumClass, output, checksums); - } - catch(const Slice::FileException& ex) - { - // - // If a file could not be created, then cleanup any created files. - // - FileTracker::instance()->cleanup(); - consoleErr << argv[0] << ": error: " << ex.reason() << endl; - return EXIT_FAILURE; - } - } - if(listGenerated) { FileTracker::instance()->dumpxml(); diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index c85f0393748..2dbfcf090c8 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -8,7 +8,6 @@ #include <Gen.h> #include <IceUtil/Iterator.h> #include <IceUtil/UUID.h> -#include <Slice/Checksum.h> #include <Slice/FileTracker.h> #include <Slice/Util.h> diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index c11a95535cd..196d967d361 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -14,7 +14,6 @@ #endif #include <IceUtil/Iterator.h> #include <IceUtil/UUID.h> -#include <Slice/Checksum.h> #include <Slice/FileTracker.h> #include <Slice/Util.h> #include <string.h> diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index 89693422fc6..1fc644ae23c 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -11,7 +11,6 @@ #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> #include <IceUtil/ConsoleUtil.h> -#include <Slice/Checksum.h> #include <Slice/Preprocessor.h> #include <Slice/FileTracker.h> #include <Slice/PHPUtil.h> @@ -1484,7 +1483,7 @@ CodeVisitor::collectExceptionMembers(const ExceptionPtr& p, MemberInfoList& allM } static void -generate(const UnitPtr& un, bool all, bool checksum, bool ns, const vector<string>& includePaths, Output& out) +generate(const UnitPtr& un, bool all, bool ns, const vector<string>& includePaths, Output& out) { if(!all) { @@ -1518,55 +1517,6 @@ generate(const UnitPtr& un, bool all, bool checksum, bool ns, const vector<strin CodeVisitor codeVisitor(out, ns); un->visit(&codeVisitor, false); - if(checksum) - { - ChecksumMap checksums = createChecksums(un); - if(!checksums.empty()) - { - out << sp; - if(ns) - { - out << "namespace"; // Global namespace. - out << sb; - out << "new Ice\\SliceChecksumInit(array("; - for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end();) - { - out << nl << "\"" << p->first << "\" => \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\""; - if(++p != checksums.end()) - { - out << ","; - } - } - out << "));"; - out << eb; - } - else - { - out << nl << "global $Ice_sliceChecksums;"; - for(ChecksumMap::const_iterator p = checksums.begin(); p != checksums.end(); ++p) - { - out << nl << "$Ice_sliceChecksums[\"" << p->first << "\"] = \""; - ostringstream str; - str.flags(ios_base::hex); - str.fill('0'); - for(vector<unsigned char>::const_iterator q = p->second.begin(); q != p->second.end(); ++q) - { - str << static_cast<int>(*q); - } - out << str.str() << "\";"; - } - } - } - } - out << nl; // Trailing newline. } @@ -1640,7 +1590,6 @@ usage(const string& n) "--validate Validate command line options.\n" "--all Generate code for Slice definitions in included files.\n" "--no-namespace Do not use PHP namespaces (deprecated).\n" - "--checksum Generate checksums for Slice definitions.\n" "--ice Allow reserved Ice prefix in Slice identifiers\n" " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" "--underscore Allow underscores in Slice identifiers\n" @@ -1667,7 +1616,6 @@ compile(const vector<string>& argv) opts.addOpt("", "ice"); opts.addOpt("", "underscore"); opts.addOpt("", "all"); - opts.addOpt("", "checksum"); opts.addOpt("n", "no-namespace"); bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end(); @@ -1736,8 +1684,6 @@ compile(const vector<string>& argv) bool all = opts.isSet("all"); - bool checksum = opts.isSet("checksum"); - bool ns = !opts.isSet("no-namespace"); if(args.empty()) @@ -1891,7 +1837,7 @@ compile(const vector<string>& argv) // // Generate the PHP mapping. // - generate(u, all, checksum, ns, includePaths, out); + generate(u, all, ns, includePaths, out); out << "?>\n"; out.close(); |