X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.h;h=90d9affad48156848b3a92da9195fa17f87d0373;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=b6256c26a34c0a3f39f1863f0f11d63f06b6b50b;hpb=7c6267e4b10364cc892776e0a426eb32ade6b0b4;p=lyx.git

diff --git a/src/chset.h b/src/chset.h
index b6256c26a3..90d9affad4 100644
--- 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;
 	///
-	pair<bool, int> 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_;
 };