From 4c3a69715e457489f14706b6f00c5f858c5df12a Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 26 Jan 2000 14:23:46 +0000 Subject: [PATCH] Move some using directives at the beginninc of files git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@450 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ src/lastfiles.C | 4 ++-- src/table.C | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cb6d53047..b936ef43ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-01-26 Jean-Marc Lasgouttes + * src/lastfiles.C: move using directives in global scope (egcs 1.x + complains otherwise). + * src/table.C: ditto + * lib/reLyX/reLyX.in: use variable @LYX_DIR@ as built-in data directory. diff --git a/src/lastfiles.C b/src/lastfiles.C index a883203278..da4d4d9a54 100644 --- a/src/lastfiles.C +++ b/src/lastfiles.C @@ -18,6 +18,8 @@ #include using std::ifstream; using std::ofstream; +using std::copy; +using std::ostream_iterator; #include using std::find; @@ -82,8 +84,6 @@ void LastFiles::writeFile(string const & filename) const // algorithms. I'll leave this in, and if I get reports // about compilations errors I take it out again before // 1.1.4. (Lgb) - using std::copy; - using std::ostream_iterator; copy(files.begin(), files.end(), ostream_iterator(ofs, "\n")); #endif diff --git a/src/table.C b/src/table.C index 5186ca80a9..fad945dda5 100644 --- a/src/table.C +++ b/src/table.C @@ -17,6 +17,9 @@ #include "layout.h" #include "support/lstrings.h" +#include +using std::max; + #ifdef __GNUG__ #pragma implementation #endif @@ -743,7 +746,6 @@ bool LyXTable::calculate_width_of_column(int column) { int old_column_width = column_info[column].width_of_column; int maximum = 0; - using std::max; for (int i = 0; i < rows; ++i) { maximum = max(cell_info[i][column].width_of_cell, maximum); -- 2.39.2