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/slice2cpp | |
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/slice2cpp')
-rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 45 | ||||
-rw-r--r-- | cpp/src/slice2cpp/Gen.h | 3 | ||||
-rw-r--r-- | cpp/src/slice2cpp/Main.cpp | 6 |
3 files changed, 2 insertions, 52 deletions
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) |