get rid of MSVC warning (signed/unsigned comparison)

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

diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C
index a4a1eacb88aeca86d9a9bd3da830302661ec1b80..1923910a405ce31284db1a6a156907a0573e29a0 100644 (file)
--- a/src/support/lyxsum.C
+++ b/src/support/lyxsum.C
@@ -1,21 +1,38 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *           Copyright 2001 The LyX Team.
+/**
+ * \file lyxsum.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \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 "support/filename.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 struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
+
 // Various implementations of lyx::sum(), depending on what methods
 // are available. Order is faster to slowest.
 #if defined(HAVE_MMAP) && defined(HAVE_MUNMAP)
@@ -24,32 +41,35 @@
 // not `compatibility' version with caddr_t.
 #define _POSIX_C_SOURCE 199506L
 
-#include <sys/types.h>
-#include <sys/stat.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #include <fcntl.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 #include <sys/mman.h>
 
-using std::ifstream;
-using std::endl;
-using std::for_each;
-using std::istreambuf_iterator;
-using std::istream_iterator;
-using std::ios;
 
+namespace lyx {
+namespace support {
 
-unsigned long lyx::sum(string const & file)
+unsigned long sum(FileName const & file)
 {
        lyxerr[Debug::FILES] << "lyx::sum() using mmap (lightning fast)"
                             << endl;
-       
-       int fd = open(file.c_str(), O_RDONLY);
+
+       int fd = open(file.toFilesystemEncoding().c_str(), O_RDONLY);
        if (!fd)
                return 0;
-       
+
        struct stat info;
        fstat(fd, &info);
-       
+
        void * mm = mmap(0, info.st_size, PROT_READ,
                         MAP_PRIVATE, fd, 0);
        // Some platforms have the wrong type for MAP_FAILED (compaq cxx).
@@ -57,24 +77,29 @@ unsigned long lyx::sum(string const & file)
                close(fd);
                return 0;
        }
-       
+
        char * beg = static_cast<char*>(mm);
        char * end = beg + info.st_size;
-       
+
        boost::crc_32_type crc;
        crc.process_block(beg, end);
        unsigned long result = crc.checksum();
-       
+
        munmap(mm, info.st_size);
        close(fd);
-       
+
        return result;
 }
+
+} // namespace support
+} // namespace lyx
+
 #else // No mmap
 
 #include <fstream>
 #include <iterator>
 
+
 namespace {
 
 template<typename InputIterator>
@@ -82,41 +107,56 @@ 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();
 }
 
-} // namespace
+} // namespace anon
+
 
+namespace lyx {
+namespace support {
+
+using std::ifstream;
 #if HAVE_DECL_ISTREAMBUF_ITERATOR
-unsigned long lyx::sum(string const & file)
+using std::istreambuf_iterator;
+
+unsigned long sum(FileName const & file)
 {
        lyxerr[Debug::FILES] << "lyx::sum() using istreambuf_iterator (fast)"
                             << endl;
 
-       ifstream ifs(file.c_str());
+       ifstream ifs(file.toFilesystemEncoding().c_str());
        if (!ifs) return 0;
-       
+
        istreambuf_iterator<char> beg(ifs);
        istreambuf_iterator<char> end;
-       
+
        return do_crc(beg,end);
 }
 #else
-unsigned long lyx::sum(string const & file)
+
+using std::istream_iterator;
+using std::ios;
+
+unsigned long sum(FileName const & file)
 {
        lyxerr[Debug::FILES]
                << "lyx::sum() using istream_iterator (slow as a snail)"
                << endl;
-       
-       ifstream ifs(file.c_str());
+
+       ifstream ifs(file.toFilesystemEncoding().c_str());
        if (!ifs) return 0;
-       
+
        ifs.unsetf(ios::skipws);
        istream_iterator<char> beg(ifs);
        istream_iterator<char> end;
-       
+
        return do_crc(beg,end);
 }
 #endif
+
+} // namespace support
+} // namespace lyx
+
 #endif // mmap