compilation fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1936 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f17fdf8042ca87685db23ad43ee452c276f928d..d079dd3c0535830a4ee3e73400944c8713f7bd7a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * lyxfunc.C (Dispatch): 
+       * minibuffer.C: 
+       * minibuffer.h: add a few std:: qualifiers
+
 2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * minibuffer.[Ch]: reimplement so that commands is initiated and

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 210d46f49aa0999cbefb8941e6cdcb8fd0c33b95..26cc837da13094a1231d212b21b0565aad9e3e4f 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -809,10 +809,10 @@ string const LyXFunc::Dispatch(int ac,
        // --- Misc -------------------------------------------
        case LFUN_EXEC_COMMAND:
        {
-               vector<string> allCmds;
-               transform(lyxaction.func_begin(), lyxaction.func_end(),
-                         back_inserter(allCmds), lyx::firster());
-               static vector<string> hist;
+               std::vector<string> allCmds;
+               std::transform(lyxaction.func_begin(), lyxaction.func_end(),
+                              std::back_inserter(allCmds), lyx::firster());
+               static std::vector<string> hist;
                owner->getMiniBuffer()->getString(MiniBuffer::nospaces,
                                                  allCmds, hist);
        }

diff --git a/src/minibuffer.C b/src/minibuffer.C
index c6171fd541c801bbf7fc1d2b52ebc169b7b19701..5e1f324423498ae8cfe5147d3245c247aee8bae3 100644 (file)
--- a/src/minibuffer.C
+++ b/src/minibuffer.C
@@ -28,6 +28,7 @@
 
 using std::endl;
 using SigC::slot;
+using std::vector;
 
 extern LyXAction lyxaction;
 
@@ -121,7 +122,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                        vector<string> comp;
                        lyx::copy_if(completion_.begin(),
                                     completion_.end(),
-                                    back_inserter(comp), prefix(input));
+                                    std::back_inserter(comp), prefix(input));
 
                        if (comp.empty()) {
                                // No matches
@@ -144,7 +145,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                        vector<string> vtmp;
                                        lyx::copy_if(comp.begin(),
                                                     comp.end(),
-                                                    back_inserter(vtmp),
+                                                    std::back_inserter(vtmp),
                                                     prefix(test));
                                        if (vtmp.size() != comp.size()) {
                                                test.erase(test.length() - 1);
@@ -157,7 +158,7 @@ int MiniBuffer::peek_event(FL_OBJECT * ob, int event, int key)
                                // How should the possible matches
                                // be visualized?
                                std::copy(comp.begin(), comp.end(),
-                                         ostream_iterator<string>(cerr, "\n"));
+                                         std::ostream_iterator<string>(std::cerr, "\n"));
                        }
                        return 1; 
                }

diff --git a/src/minibuffer.h b/src/minibuffer.h
index b71126c5d05b67937f7c2573d0d68a09f9a942e7..eb75794ecfc4406682ae06344d17c43758772e8c 100644 (file)
--- a/src/minibuffer.h
+++ b/src/minibuffer.h
@@ -44,8 +44,8 @@ public:
            emitted.
        */
        void getString(State space,
-                      vector<string> const & completion,
-                      vector<string> & history);
+                      std::vector<string> const & completion,
+                      std::vector<string> & history);
        ///
        void redraw();
        ///
@@ -88,11 +88,11 @@ private:
        ///
        FL_OBJECT * the_buffer;
        ///
-       vector<string> completion_;
+       std::vector<string> completion_;
        ///
-       vector<string> * history_;
+       std::vector<string> * history_;
        ///
-       vector<string>::iterator hist_iter;
+       std::vector<string>::iterator hist_iter;
        ///
        State state_;
 };