From a9b8bedc79a839c4ca3e593d312f3e1cc8900ac0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 12 Mar 2001 08:52:37 +0000 Subject: [PATCH] make it compile with gcc 3.0 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1735 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView_pimpl.C | 1 + src/ChangeLog | 8 ++++++++ src/ShareContainer.h | 2 +- src/buffer.C | 1 + src/lyx_cb.C | 1 + 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index a94ef0dedb..6e79fd1811 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -65,6 +65,7 @@ extern int greek_kb_flag; using SigC::slot; #endif +using std::vector; using std::find_if; using std::pair; using std::endl; diff --git a/src/ChangeLog b/src/ChangeLog index 5834d2b475..986f0d94ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,13 @@ 2001-03-12 Lars Gullik Bjønnes + * lyx_cb.C: readd using std::ios. + + * buffer.C: add using std::map. + + * BufferView_pimpl.C: add using std::vector. + + * ShareContainer.h: add std:: to swap. + * buffer.h: add some typedefs * buffer.C (getLists): use them (getLists): renamed from getTocList. diff --git a/src/ShareContainer.h b/src/ShareContainer.h index b4b5206b5d..70b4ad9fc0 100644 --- a/src/ShareContainer.h +++ b/src/ShareContainer.h @@ -46,7 +46,7 @@ public: // move it forward - optimization // makes the next find faster. if (it != params.begin()) - swap(*it, *(it - 1)); + std::swap(*it, *(it - 1)); } return tmp; } diff --git a/src/buffer.C b/src/buffer.C index 7adb42fc79..4c06515ebd 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -107,6 +107,7 @@ using std::endl; using std::pair; using std::make_pair; using std::vector; +using std::map; using std::max; using std::set; diff --git a/src/lyx_cb.C b/src/lyx_cb.C index ffd6289c8c..90331ad00c 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -39,6 +39,7 @@ using std::vector; using std::ifstream; using std::copy; using std::endl; +using std::ios; using std::back_inserter; using std::istream_iterator; using std::pair; -- 2.39.2