Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / LyXAction.h

diff --git a/src/LyXAction.h b/src/LyXAction.h
index a1e4f834e0618778c138f6d6e4b6a5aeb0e93e97..4fadb5c04840c4e8c2367096ab60d45c0022ae7a 100644 (file)
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -11,8 +11,6 @@
 #include "commandtags.h"
 #include "LString.h"
 
-using std::map;
-
 /** This class encapsulates LyX action and user command operations.
  */
 class LyXAction {
@@ -31,20 +29,15 @@ private:
        };
 public:
        ///
-       typedef map<string, kb_action> func_map;
-       //typedef map<string, kb_action, less<string> > func_map;
+       typedef std::map<string, kb_action> func_map;
        ///
-       typedef map<kb_action, func_info> info_map;
-       //typedef map<kb_action, func_info, less<kb_action> > info_map;
+       typedef std::map<kb_action, func_info> info_map;
        ///
-       typedef map<unsigned int, pseudo_func> pseudo_map;
-       //typedef map<unsigned int, pseudo_func, less<unsigned int> > pseudo_map;
+       typedef std::map<unsigned int, pseudo_func> pseudo_map;
        ///
-       typedef map<string, unsigned int> arg_item;
-       //typedef map<string, unsigned int, less<string> > arg_item;
+       typedef std::map<string, unsigned int> arg_item;
        ///
-       typedef map<kb_action, arg_item> arg_map;
-       //typedef map<kb_action, arg_item, less<kb_action> > arg_map;
+       typedef std::map<kb_action, arg_item> arg_map;
 
        ///
        enum func_attrib {