get builddir!=srcdir compiling working; allow successful make even without noweb...

[lyx.git] / src / chset.h

diff --git a/src/chset.h b/src/chset.h
index 30df042b0c937b61eff59e4fb2cbae60da79c838..90d9affad48156848b3a92da9195fa17f87d0373 100644 (file)
--- a/src/chset.h
+++ b/src/chset.h
@@ -7,9 +7,9 @@
 #endif
 
 #include <map>
-#include "LString.h"
+#include <utility>
 
-using std::map;
+#include "LString.h"
 
 ///
 class CharacterSet {
@@ -19,12 +19,12 @@ public:
        ///
        string const & getName() const;
        ///
-       bool encodeString(string &) const;
+       std::pair<bool, int> const encodeString(string const &) const;
 private:
        ///
        string name_;
        ///
-       typedef map<string, unsigned char> Cdef;
+       typedef std::map<string, unsigned char> Cdef;
        ///
        Cdef map_;
 };