fix std:: namespace problems

diff --git a/util/epist/keytree.cc b/util/epist/keytree.cc
index 3f4b99069adb75c58d898a627ea937ec13dfff0e..cf0dd379ea148be1faca259b1b3834683efa8e94 100644 (file)
--- a/util/epist/keytree.cc
+++ b/util/epist/keytree.cc
@@ -22,6 +22,11 @@
 
 #include "keytree.hh"
 
+#include <string>
+
+using std::string;
+
+
 keytree::keytree(Display *display) : _display(display)
 {
   _head = new keynode;

diff --git a/util/epist/parser.cc b/util/epist/parser.cc
index 660a876ff04c0d9d92ba362557ac7f5df8801ae1..bbf5dad12e0153c18f0c0baf729aae8549a9597c 100644 (file)
--- a/util/epist/parser.cc
+++ b/util/epist/parser.cc
@@ -1,10 +1,16 @@
 extern "C" {
 #include <stdio.h>
 }
+
 #include "parser.hh"
 
+#include <string>
+
+using std::string;
+
+
 parser::parser(keytree *kt)
-    : _mask(0), _action(Action::noaction), _key(""), _arg(""), _kt(kt)
+    : _kt(kt), _mask(0), _action(Action::noaction), _key(""), _arg("") 
 {
 }
 

diff --git a/util/epist/parser.hh b/util/epist/parser.hh
index 148649bd174b445f442bc1b9f3950264cac4bcf2..a66e414126ccda26a3af788dd1b5d1f76b07051f 100644 (file)
--- a/util/epist/parser.hh
+++ b/util/epist/parser.hh
@@ -1,7 +1,8 @@
-#include <string>
 #include "actions.hh"
 #include "keytree.hh"
 
+#include <string>
+
 class parser {
 public:
     parser(keytree *);