Removed slice checksums

6 files changed, 3 insertions, 128 deletions

diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 5938f4c9d38..c55acf4e2c2 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -11,7 +11,6 @@
 #include <Slice/CPlusPlusUtil.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/Iterator.h>
-#include <Slice/Checksum.h>
 
 #include <limits>
 #include <sys/stat.h>
@@ -22,15 +21,14 @@ using namespace IceUtil;
 
 Slice::Gen::Gen(const string& name, const string& base,	const string& headerExtension,
 	        const string& sourceExtension, const string& include, const vector<string>& includePaths,
-		const string& dllExport, const string& dir, bool imp, bool checksum) :
+		const string& dllExport, const string& dir, bool imp) :
     _base(base),
     _headerExtension(headerExtension),
     _sourceExtension(sourceExtension),
     _include(include),
     _includePaths(includePaths),
     _dllExport(dllExport),
-    _impl(imp),
-    _checksum(checksum)
+    _impl(imp)
 {
     for(vector<string>::iterator p = _includePaths.begin(); p != _includePaths.end(); ++p)
     {
@@ -214,11 +212,6 @@ Slice::Gen::generate(const UnitPtr& p)
         C << "\n#include <Ice/LocalException.h>";
     }
 
-    if(_checksum)
-    {
-        C << "\n#include <Ice/SliceChecksums.h>";
-    }
-
     StringList includes = p->includeFiles();
 
     for(StringList::const_iterator q = includes.begin(); q != includes.end(); ++q)
@@ -278,31 +271,6 @@ Slice::Gen::generate(const UnitPtr& p)
         ImplVisitor implVisitor(implH, implC, _dllExport);
         p->visit(&implVisitor, false);
     }
-
-    if(_checksum)
-    {
-        ChecksumMap map = createChecksums(p);
-        if(!map.empty())
-        {
-            C << sp << nl << "static const char* __sliceChecksums[] =";
-            C << sb;
-            for(ChecksumMap::const_iterator p = map.begin(); p != map.end(); ++p)
-            {
-                C << 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 << (int)(*q);
-                }
-                C << str.str() << "\",";
-            }
-            C << nl << "0";
-            C << eb << ';';
-            C << nl << "static IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);";
-        }
-    }
 }
 
 Slice::Gen::TypesVisitor::TypesVisitor(Output& h, Output& c, const string& dllExport) :
diff --git a/cpp/src/slice2cppe/Gen.h b/cpp/src/slice2cppe/Gen.h
index a7b87ee55de..c0abba0a8ab 100644
--- a/cpp/src/slice2cppe/Gen.h
+++ b/cpp/src/slice2cppe/Gen.h
@@ -28,7 +28,6 @@ public:
 	const std::vector<std::string>&,
 	const std::string&,
 	const std::string&,
-        bool,
         bool);
     ~Gen();
 
@@ -51,7 +50,6 @@ private:
     std::vector<std::string> _includePaths;
     std::string _dllExport;
     bool _impl;
-    bool _checksum;
 
     class TypesVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
diff --git a/cpp/src/slice2cppe/Main.cpp b/cpp/src/slice2cppe/Main.cpp
index 0b463233774..cb8288dcda9 100644
--- a/cpp/src/slice2cppe/Main.cpp
+++ b/cpp/src/slice2cppe/Main.cpp
@@ -36,7 +36,6 @@ usage(const char* n)
         "--depend             Generate Makefile dependencies.\n"
         "-d, --debug          Print debug messages.\n"
         "--ice                Permit `Ice' prefix (for building Ice source code only)\n"
-        "--checksum           Generate checksums for Slice definitions.\n"
         ;
     // Note: --case-sensitive is intentionally not shown here!
 }
@@ -54,7 +53,6 @@ main(int argc, char* argv[])
     bool depend;
     bool debug;
     bool ice;
-    bool checksum;
     bool caseSensitive;
 
     IceUtil::Options opts;
@@ -73,7 +71,6 @@ main(int argc, char* argv[])
     opts.addOpt("", "depend");
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
-    opts.addOpt("", "checksum");
     opts.addOpt("", "case-sensitive");
 
     vector<string> args;
@@ -143,7 +140,6 @@ main(int argc, char* argv[])
     depend = opts.isSet("depend");
     debug = opts.isSet("d") || opts.isSet("debug");
     ice = opts.isSet("ice");
-    checksum = opts.isSet("checksum");
     caseSensitive = opts.isSet("case-sensitive");
 
     if(args.empty())
@@ -204,7 +200,7 @@ main(int argc, char* argv[])
 		else
 		{
 		    Gen gen(argv[0], icecpp.getBaseName(), headerExtension, sourceExtension, include,
-			    includePaths, dllExport, output, impl, checksum);
+			    includePaths, dllExport, output, impl);
 		    if(!gen)
 		    {
 			u->destroy();
diff --git a/cpp/src/slice2javae/Gen.cpp b/cpp/src/slice2javae/Gen.cpp
index ae512fe9188..3503e18fd6b 100644
--- a/cpp/src/slice2javae/Gen.cpp
+++ b/cpp/src/slice2javae/Gen.cpp
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <Gen.h>
-#include <Slice/Checksum.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/Algorithm.h>
 #include <IceUtil/Iterator.h>
@@ -748,65 +747,6 @@ Slice::Gen::generateImplTie(const UnitPtr& p)
     p->visit(&implTieVisitor, 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;
-    if(!out.openClass(checksumClass, dir))
-    {
-        cerr << "can't open class `" << checksumClass << "' for writing: " << strerror(errno) << endl;
-        return;
-    }
-
-    //
-    // 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 java.util.Map checksums;";
-    out << sp << nl << "static";
-    out << sb;
-    out << nl << "java.util.Map 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 << (int)(*q);
-        }
-        out << str.str() << "\");";
-    }
-    out << nl << "checksums = java.util.Collections.unmodifiableMap(map);";
-
-    out << eb;
-    out << eb;
-    out << nl;
-}
-
 Slice::Gen::OpsVisitor::OpsVisitor(const string& dir) :
     JavaVisitor(dir)
 {
@@ -1529,7 +1469,6 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 	out << nl << "__is.startReadSlice();";
         iter = 0;
 	DataMemberList classMembers = p->classDataMembers();
-	long classMemberCount = allClassMembers.size() - classMembers.size();
         for(d = members.begin(); d != members.end(); ++d)
         {
 	    ostringstream patchParams;
@@ -1787,7 +1726,6 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
         out << sp << nl << "public void" << nl << "__read(IceInternal.BasicStream __is)";
         out << sb;
         iter = 0;
-	int classMemberCount = 0;
         for(d = members.begin(); d != members.end(); ++d)
         {
 	    ostringstream patchParams;
diff --git a/cpp/src/slice2javae/Gen.h b/cpp/src/slice2javae/Gen.h
index c0437cc15ce..06744860ab7 100644
--- a/cpp/src/slice2javae/Gen.h
+++ b/cpp/src/slice2javae/Gen.h
@@ -12,7 +12,6 @@
 
 #include <Slice/Parser.h>
 #include <Slice/JavaUtil.h>
-#include <Slice/Checksum.h>
 
 namespace Slice
 {
@@ -77,8 +76,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/slice2javae/Main.cpp b/cpp/src/slice2javae/Main.cpp
index e9e8e24afbf..1e54ce83284 100644
--- a/cpp/src/slice2javae/Main.cpp
+++ b/cpp/src/slice2javae/Main.cpp
@@ -34,7 +34,6 @@ usage(const char* n)
 	"--depend                Generate Makefile dependencies.\n"
         "-d, --debug             Print debug messages.\n"
         "--ice                   Permit `Ice' prefix (for building Ice source code only)\n"
-        "--checksum CLASS        Generate checksums for Slice definitions into CLASS.\n"
         ;
     // Note: --case-sensitive is intentionally not shown here!
 }
@@ -52,7 +51,6 @@ main(int argc, char* argv[])
     bool depend;
     bool debug;
     bool ice;
-    string checksumClass;
     bool caseSensitive;
 
     IceUtil::Options opts;
@@ -69,7 +67,6 @@ main(int argc, char* argv[])
     opts.addOpt("", "depend");
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
-    opts.addOpt("", "checksum", IceUtil::Options::NeedArg);
     opts.addOpt("", "case-sensitive");
 
     vector<string>args;
@@ -129,10 +126,6 @@ main(int argc, char* argv[])
     depend = opts.isSet("depend");
     debug = opts.isSet("d") || opts.isSet("debug");
     ice = opts.isSet("ice");
-    if(opts.isSet("checksum"))
-    {
-	checksumClass = opts.optArg("checksum");
-    }
     caseSensitive = opts.isSet("case-sensitive");
 
     if(args.empty())
@@ -151,8 +144,6 @@ main(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    ChecksumMap checksums;
-
     for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
 	if(depend)
@@ -221,24 +212,11 @@ main(int argc, char* argv[])
 		    {
 			gen.generateImplTie(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()));
-		    }
 		}
 		p->destroy();
 	    }
 	}
     }
 
-    if(!checksumClass.empty())
-    {
-        Gen::writeChecksumClass(checksumClass, output, checksums);
-    }
-
     return status;
 }