lyx-devel.diff

[lyx.git] / src / support / lyxsum.C

diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C
index a0efb5d1b755847b1092c7260d5beeef90b33401..8980a3f8ae91843a0357cd8c5406fbe4311fa7fb 100644 (file)
--- a/src/support/lyxsum.C
+++ b/src/support/lyxsum.C
@@ -17,16 +17,7 @@
 
 #include <fstream>
 
-#if 0
-#ifdef HAVE_SSTREAM
-#include <sstream>
-using std::ostringstream;
-#else
-#include <strstream>
-#endif
-#else
 #include "Lsstream.h"
-#endif
 
 #include "support/lyxlib.h"
 
@@ -115,27 +106,16 @@ unsigned long do_crc(InputIterator first, InputIterator last)
 
 
 // And this would be the file interface.
-unsigned long lyx::sum(char const * file)
+unsigned long lyx::sum(string const & file)
 {
-       ifstream ifs(file);
+       ifstream ifs(file.c_str());
        if (!ifs) return 0;
        ifs.unsetf(ios::skipws);
-//#ifdef HAVE_SSTREAM
        ostringstream ostr;
        ostr << ifs.rdbuf();
        // The .c_str() is here in case we use our lyxstring class
        // instead of standard string. 
        string w = ostr.str().c_str();
        return do_crc(w.begin(), w.end());
-//#else
-//     ostrstream ostr;
-//     ostr << ifs.rdbuf();
-//     ostr << '\0';
-//     char * tmp = ostr.str();
-//     if (!tmp) return 0; // empty file
-//     string w(tmp, ostr.tellp());
-//     unsigned long crc = do_crc(w.begin(), w.end());
-//     delete tmp;
-//     return crc;
-//#endif
 }
+