diff options
author | Jose <jose@zeroc.com> | 2017-02-02 10:24:37 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2017-02-02 10:24:37 +0100 |
commit | b56911178738da4f8e1733db30c7e5ae5627eb9d (patch) | |
tree | 5606e07d19cd7e85e2942388b573f45f1c17fbbb /cpp | |
parent | Fix for IceRuby builds (diff) | |
download | ice-b56911178738da4f8e1733db30c7e5ae5627eb9d.tar.bz2 ice-b56911178738da4f8e1733db30c7e5ae5627eb9d.tar.xz ice-b56911178738da4f8e1733db30c7e5ae5627eb9d.zip |
Pass warning level to the ChecksumVisitor for consistency
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/src/Slice/Checksum.cpp | 4 | ||||
-rw-r--r-- | cpp/src/Slice/Checksum.h | 2 | ||||
-rw-r--r-- | cpp/src/Slice/PythonUtil.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Slice/RubyUtil.cpp | 2 | ||||
-rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 | ||||
-rw-r--r-- | cpp/src/slice2cs/Gen.cpp | 2 | ||||
-rw-r--r-- | cpp/src/slice2java/Main.cpp | 2 | ||||
-rw-r--r-- | cpp/src/slice2php/Main.cpp | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp index 887a350903f..1dd25cef5c8 100644 --- a/cpp/src/Slice/Checksum.cpp +++ b/cpp/src/Slice/Checksum.cpp @@ -442,11 +442,11 @@ Slice::ChecksumVisitor::updateMap(const string& scoped, const string& data) } Slice::ChecksumMap -Slice::createChecksums(const UnitPtr& u) +Slice::createChecksums(const UnitPtr& u, int warningLevel) { ChecksumMap result; - ChecksumVisitor visitor(result, 0); + ChecksumVisitor visitor(result, warningLevel); u->visit(&visitor, false); return result; diff --git a/cpp/src/Slice/Checksum.h b/cpp/src/Slice/Checksum.h index 3744d8a6ad4..158ac182f77 100644 --- a/cpp/src/Slice/Checksum.h +++ b/cpp/src/Slice/Checksum.h @@ -19,7 +19,7 @@ namespace Slice typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap; -ChecksumMap createChecksums(const UnitPtr&); +ChecksumMap createChecksums(const UnitPtr&, int); } diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index c3e98bd1627..4d5a23caf9d 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -2870,7 +2870,7 @@ Slice::Python::generate(const UnitPtr& un, bool all, bool checksum, const vector if(checksum) { - ChecksumMap checksums = createChecksums(un); + ChecksumMap checksums = createChecksums(un, warningLevel); if(!checksums.empty()) { out << sp; diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp index f0cbcdc7fb1..574a7cf2644 100644 --- a/cpp/src/Slice/RubyUtil.cpp +++ b/cpp/src/Slice/RubyUtil.cpp @@ -1472,7 +1472,7 @@ Slice::Ruby::generate(const UnitPtr& un, bool all, bool checksum, const vector<s if(checksum) { - ChecksumMap checksums = createChecksums(un); + ChecksumMap checksums = createChecksums(un, warningLevel); if(!checksums.empty()) { out << sp; diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index df72af69bc0..dd1ca22855c 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -423,7 +423,7 @@ Slice::Gen::generateChecksumMap(const UnitPtr& p) { if(_checksum) { - ChecksumMap map = createChecksums(p); + ChecksumMap map = createChecksums(p, _warningLevel); if(!map.empty()) { C << sp << nl << "namespace"; diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 5e6fc6b6407..c1377db72cd 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -2145,7 +2145,7 @@ Slice::Gen::generateImplTie(const UnitPtr& p) void Slice::Gen::generateChecksums(const UnitPtr& u) { - ChecksumMap map = createChecksums(u); + ChecksumMap map = createChecksums(u, _warningLevel); if(!map.empty()) { string className = "X" + generateUUID(); diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 2ea06372755..c14a467d3b7 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -380,7 +380,7 @@ compile(const vector<string>& argv) // // Calculate checksums for the Slice definitions in the unit. // - ChecksumMap m = createChecksums(p); + ChecksumMap m = createChecksums(p, warningLevel); copy(m.begin(), m.end(), inserter(checksums, checksums.begin())); } if(listGenerated) diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index 205aec133b3..787e83ac1b8 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -1509,7 +1509,7 @@ generate(const UnitPtr& un, bool all, bool checksum, bool ns, const vector<strin if(checksum) { - ChecksumMap checksums = createChecksums(un); + ChecksumMap checksums = createChecksums(un, warningLevel); if(!checksums.empty()) { out << sp; |