From f6b8ed1c32480ff4c135b93c0296e895f9517967 Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Mon, 6 Oct 2003 09:35:38 +0000 Subject: [PATCH] Small fixes to allow building with STLport git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7858 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/graph.C | 1 + src/mathed/ChangeLog | 7 +++++++ src/mathed/math_cursor.C | 2 ++ src/mathed/math_parser.C | 2 ++ src/mathed/math_sizeinset.C | 2 ++ src/mathed/math_streamstr.C | 2 +- src/paragraph_pimpl.C | 1 + src/support/ChangeLog | 4 ++++ src/support/lstrings.C | 1 + 10 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index d5aec51a75..397e0897ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,9 @@ +2003-10-06 Martin Vermeer + + * graph.C: + * paragraph_pimpl.C: Small fixes to build using STLport + 2003-10-02 André Pönitz * lyxfunc.C: diff --git a/src/graph.C b/src/graph.C index 41d9ab6ddb..66daec8263 100644 --- a/src/graph.C +++ b/src/graph.C @@ -16,6 +16,7 @@ #include using std::vector; +using std::reverse; int Graph::bfs_init(int s, bool clear_visited) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 0c8542b967..8b32c25dee 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,10 @@ +2003-10-06 Martin Vermeer + + * math_cursor.C: + * math_parser.C: + * math_sizeinset.C: + * math_streamstr.C: Small fixes to build using STLport + 2003-09-22 Jean-Marc Lasgouttes * math_symbolinset.C (metrics): apply a different hack to metrics diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C index 8225a9eef1..6ac63b7be8 100644 --- a/src/mathed/math_cursor.C +++ b/src/mathed/math_cursor.C @@ -36,7 +36,9 @@ //#define FILEDEBUG 1 using std::endl; +#ifndef CXX_GLOBAL_CSTD using std::isalpha; +#endif using std::min; using std::swap; diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 3f812cb99d..b19c75e53a 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -65,7 +65,9 @@ following hack as starting point to write some macros: #include "support/std_sstream.h" #include "debug.h" +#ifndef CXX_GLOBAL_CSTD using std::atoi; +#endif using std::endl; using std::fill; diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C index b7cf00fe9f..04ee8dadee 100644 --- a/src/mathed/math_sizeinset.C +++ b/src/mathed/math_sizeinset.C @@ -17,7 +17,9 @@ #include "math_streamstr.h" #include "support/std_ostream.h" +#ifndef CXX_GLOBAL_CSTD using std::atoi; +#endif using std::auto_ptr; diff --git a/src/mathed/math_streamstr.C b/src/mathed/math_streamstr.C index 23bba271e3..eabcaf5665 100644 --- a/src/mathed/math_streamstr.C +++ b/src/mathed/math_streamstr.C @@ -12,7 +12,7 @@ #include "math_streamstr.h" #include "math_mathmlstream.h" - +#include "support/std_ostream.h" WriteStream & operator<<(WriteStream & ws, string const & s) { diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C index a79c0e36d1..30abc6913f 100644 --- a/src/paragraph_pimpl.C +++ b/src/paragraph_pimpl.C @@ -31,6 +31,7 @@ using lyx::pos_type; using std::endl; using std::upper_bound; +using std::lower_bound; using std::ostream; diff --git a/src/support/ChangeLog b/src/support/ChangeLog index cce85cdfcd..0fb7e5b0b4 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,7 @@ +2003-10-06 Martin Vermeer + + * lstrings.C: Small fixes to build using STLport + 2003-09-29 Angus Leeming * filetools.C (ReplaceEnvironmentPath): make it work for both diff --git a/src/support/lstrings.C b/src/support/lstrings.C index 70dd845294..4ebae6facc 100644 --- a/src/support/lstrings.C +++ b/src/support/lstrings.C @@ -20,6 +20,7 @@ #include "tostr.h" #include +#include #include -- 2.39.2