compile fix?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21494 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index ba2a653ecdcb09019046b2dea14787179a134cbf..a1ca026c633da6f7aade5bf9e99fd19cd1c2c13b 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -89,7 +89,7 @@ static bool copy_file(std::string const & source, std::string const & target, bo
 
        int const outfile = ::open(target.c_str(), flags, source_stat.st_mode);
        if (outfile == -1) {
-               int err = errno;
+               //int err = errno;
                ::close(infile);
                return false;
        }
@@ -113,7 +113,7 @@ static bool copy_file(std::string const & source, std::string const & target, bo
                }
        }
 
-       int err = errno;
+       //int err = errno;
 
        ::close(infile);
        ::close(outfile);
@@ -129,8 +129,10 @@ static bool copy_file(std::string const & source, std::string const & target, bo
                return false;
        }
 #endif
+       return true;
 }
 
+
 namespace lyx {
 namespace support {
 

diff --git a/src/support/strfwd.h b/src/support/strfwd.h
index ed22874c7dc14b7e8fe309fabe5f8c1a45e79a31..324560952fd4bb4cbb5e52b6ffa32f28d8041ad7 100644 (file)
--- a/src/support/strfwd.h
+++ b/src/support/strfwd.h
@@ -33,7 +33,7 @@ namespace std {
 
 template<typename Char> struct char_traits;
 template<> struct char_traits<char>;
-template<> struct char_traits<wchar_t>;
+template<> struct char_traits<lyx::char_type>;
 
 template<typename Alloc> class allocator;