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 22ddf19d51fc0988adb430cbe6d8380b7e84b36d..1923910a405ce31284db1a6a156907a0573e29a0 100644 (file)
--- a/src/support/lyxsum.C
+++ b/src/support/lyxsum.C
@@ -11,12 +11,18 @@
 #include <config.h>
 
 #include "support/lyxlib.h"
+
 #include "debug.h"
 
-#include <algorithm>
+#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.
@@ -25,7 +31,7 @@ using std::endl;
 // 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>;
+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.
@@ -35,22 +41,29 @@ template class boost::detail::crc_table_t<32, 0x04C11DB7, true>;
 // 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>
-#include <sys/mman.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
+#include <sys/mman.h>
 
-using std::string;
 
+namespace lyx {
+namespace support {
 
-unsigned long lyx::support::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;
 
@@ -77,6 +90,10 @@ unsigned long lyx::support::sum(string const & file)
 
        return result;
 }
+
+} // namespace support
+} // namespace lyx
+
 #else // No mmap
 
 #include <fstream>
@@ -94,18 +111,22 @@ unsigned long do_crc(InputIterator first, InputIterator last)
        return crc.checksum();
 }
 
-} // namespace
+} // namespace anon
+
+
+namespace lyx {
+namespace support {
 
-#if HAVE_DECL_ISTREAMBUF_ITERATOR
 using std::ifstream;
+#if HAVE_DECL_ISTREAMBUF_ITERATOR
 using std::istreambuf_iterator;
 
-unsigned long lyx::support::sum(string const & file)
+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);
@@ -118,13 +139,13 @@ unsigned long lyx::support::sum(string const & file)
 using std::istream_iterator;
 using std::ios;
 
-unsigned long lyx::support::sum(string const & file)
+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);
@@ -134,4 +155,8 @@ unsigned long lyx::support::sum(string const & file)
        return do_crc(beg,end);
 }
 #endif
+
+} // namespace support
+} // namespace lyx
+
 #endif // mmap