Painter and scrollbar API patches

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 843d8477ed3af3e0edb5ac0adc6c72bdf4945b22..83a0541b608afe4873091f160536bb1a64618864 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -34,6 +34,10 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
+#ifndef CXX_GLOBAL_CSTD
+using std::isdigit;
+#endif
+
 using std::vector;
 using std::queue;
 using std::endl;
@@ -721,12 +725,12 @@ bool Converters::move(string const & from, string const & to, bool copy)
        for (vector<string>::const_iterator it = files.begin();
             it != files.end(); ++it)
                if (prefixIs(*it, base)) {
-                       string from2 = path + *it;
+                       string const from2 = path + *it;
                        string to2 = to_base + it->substr(base.length());
                        to2 = ChangeExtension(to2, to_extension);
                        lyxerr[Debug::FILES] << "moving " << from2
                                             << " to " << to2 << endl;
-                       bool moved = (copy)
+                       bool const moved = (copy)
                                ? lyx::copy(from2, to2)
                                : lyx::rename(from2, to2);
                        if (!moved && no_errors) {