tostr -> convert and some bformat work

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

diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C
index f7e89fa200544eaa16c086a91650be70487c082e..3ce7994ebaed9c4e4210108f9486e56e8bffe069 100644 (file)
--- a/src/support/lyxsum.C
+++ b/src/support/lyxsum.C
@@ -5,18 +5,22 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "support/lyxlib.h"
+
 #include "debug.h"
 
-#include <algorithm>
 #include <boost/crc.hpp>
 
+#include <algorithm>
+
 using std::endl;
+using std::string;
+
 
 // OK, this is ugly, but it is the only workaround I found to compile
 // with gcc (any version) on a system which uses a non-GNU toolchain.
@@ -42,7 +46,7 @@ template class boost::detail::crc_table_t<32, 0x04C11DB7, true>;
 #include <sys/mman.h>
 
 
-unsigned long lyx::sum(string const & file)
+unsigned long lyx::support::sum(string const & file)
 {
        lyxerr[Debug::FILES] << "lyx::sum() using mmap (lightning fast)"
                             << endl;
@@ -79,7 +83,6 @@ unsigned long lyx::sum(string const & file)
 #include <fstream>
 #include <iterator>
 
-using std::for_each;
 
 namespace {
 
@@ -88,7 +91,7 @@ inline
 unsigned long do_crc(InputIterator first, InputIterator last)
 {
        boost::crc_32_type crc;
-       crc = for_each(first, last, crc);
+       crc = std::for_each(first, last, crc);
        return crc.checksum();
 }
 
@@ -98,7 +101,7 @@ unsigned long do_crc(InputIterator first, InputIterator last)
 using std::ifstream;
 using std::istreambuf_iterator;
 
-unsigned long lyx::sum(string const & file)
+unsigned long lyx::support::sum(string const & file)
 {
        lyxerr[Debug::FILES] << "lyx::sum() using istreambuf_iterator (fast)"
                             << endl;
@@ -116,7 +119,7 @@ unsigned long lyx::sum(string const & file)
 using std::istream_iterator;
 using std::ios;
 
-unsigned long lyx::sum(string const & file)
+unsigned long lyx::support::sum(string const & file)
 {
        lyxerr[Debug::FILES]
                << "lyx::sum() using istream_iterator (slow as a snail)"