From 452f57976a135c8b72fc8d8f580d5d50618c0cae Mon Sep 17 00:00:00 2001 From: Austin Henriksen Date: Wed, 30 Oct 2019 05:14:29 -0400 Subject: 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. --- cpp/src/slice2cpp/Gen.cpp | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) (limited to 'cpp/src/slice2cpp/Gen.cpp') 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 #include #include -#include #include #include @@ -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& extraHeaders, const string& include, const vector& 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::iterator p = _includePaths.begin(); p != _includePaths.end(); ++p) @@ -701,38 +699,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::const_iterator r = q->second.begin(); r != q->second.end(); ++r) - { - str << static_cast(*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) { @@ -944,11 +910,6 @@ Slice::Gen::generate(const UnitPtr& p) C << "\n#include "; } - if(_checksum) - { - C << "\n#include "; - } - C << "\n#include "; 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; -- cgit v1.2.3