Small fixes to allow building with STLport

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

diff --git a/src/ChangeLog b/src/ChangeLog
index d5aec51a75226a81ec0212eece5ed20565496627..397e0897efd4cde65d3a2c6028cc2dbd3362e469 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,9 @@
 
+2003-10-06  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * graph.C:
+       * paragraph_pimpl.C: Small fixes to build using STLport
+
 2003-10-02  André Pönitz  <poenitz@gmx.net>
 
        * lyxfunc.C:

diff --git a/src/graph.C b/src/graph.C
index 41d9ab6ddb2037f5dc96ed9e2ff6f1648b7d118d..66daec8263aaf5fb4889c245705a617cd16b2775 100644 (file)
--- a/src/graph.C
+++ b/src/graph.C
@@ -16,6 +16,7 @@
 #include <algorithm>
 
 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 0c8542b967ad799e1c3af40562df081e20c5ffbb..8b32c25deef8b570958eebf12897df9a6330c164 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-06  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * math_cursor.C:
+       * math_parser.C:
+       * math_sizeinset.C:
+       * math_streamstr.C: Small fixes to build using STLport
+
 2003-09-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * 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 8225a9eef1082a700b2c937513997471ceeac730..6ac63b7be81f079bcbf45e07f6adc607f31e0194 100644 (file)
--- 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 3f812cb99d479a228cbe8a95705b19601af627c6..b19c75e53a71ffe6935b563b746e7102ec642774 100644 (file)
--- 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 b7cf00fe9f970ddfb0f8649d945856b15ccf413b..04ee8dadee3244d7c4fe9093beec4405f9fa5b97 100644 (file)
--- 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 23bba271e3dd9ac7310a186fc7a8b338a2aa5252..eabcaf5665438b990029cbb46d40d44ba79e7f4f 100644 (file)
--- 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 a79c0e36d12c283757372d52eab56ebd5b529751..30abc6913f626cd51e38efe2f40a12c4b5dca35f 100644 (file)
--- 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 cce85cdfcdb0da2cf1aec639a1e67f317a23d3bd..0fb7e5b0b410d536d9d458cf50b6b5e1d0d3692d 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-06  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * lstrings.C: Small fixes to build using STLport
+
 2003-09-29  Angus Leeming  <leeming@lyx.org>
 
        * filetools.C (ReplaceEnvironmentPath): make it work for both

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 70dd84529405c9ba2e0843fe2e67e2bf0d3fcece..4ebae6facc26d2b08d3a46fa0265ec25dd1e84e3 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -20,6 +20,7 @@
 #include "tostr.h"
 
 #include <boost/tokenizer.hpp>
+#include <boost/assert.hpp>
 
 #include <algorithm>