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 a0fe80ecb10c263ed1ce4d26fdf7a7bea0274692..3ce7994ebaed9c4e4210108f9486e56e8bffe069 100644 (file)
--- a/src/support/lyxsum.C
+++ b/src/support/lyxsum.C
@@ -1,22 +1,35 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxsum.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *           Copyright 2001 The LyX Team.
+ * \author Lars Gullik Bjønnes
  *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
-
 #include <config.h>
 
-#include <algorithm>
-#include <boost/crc.hpp>
-
 #include "support/lyxlib.h"
+
 #include "debug.h"
 
+#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.
+// The problem is that gcc uses a weak symbol for a particular
+// instantiation and that the system linker usually does not
+// understand those weak symbols (seen on HP-UX, tru64, AIX and
+// others). Thus we force an explicit instanciation of this particular
+// template (JMarc)
+template class boost::detail::crc_table_t<32, 0x04C11DB7, true>;
 
 // Various implementations of lyx::sum(), depending on what methods
 // are available. Order is faster to slowest.
@@ -33,7 +46,7 @@ using std::endl;
 #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;
@@ -70,7 +83,6 @@ unsigned long lyx::sum(string const & file)
 #include <fstream>
 #include <iterator>
 
-using std::for_each;
 
 namespace {
 
@@ -79,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();
 }
 
@@ -89,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;
@@ -107,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)"