diff options
author | mathias <mathias> | 2005-05-12 20:16:45 (GMT) |
---|---|---|
committer | mathias <mathias> | 2005-05-12 20:16:45 (GMT) |
commit | 64336d4cec99202a7740fc062190c1f1cfa577db (patch) | |
tree | d8ebe3171594a64c2d25fac2065b3cc8c189e8e6 /src/FbTk | |
parent | 6280b9de0545a8af80ea2f54f5ebe4492a690dbf (diff) | |
download | fluxbox_paul-64336d4cec99202a7740fc062190c1f1cfa577db.zip fluxbox_paul-64336d4cec99202a7740fc062190c1f1cfa577db.tar.bz2 |
llittle rewrite for the FbTk_istringstream usage.. was needed coz gcc2.95.x
systems had problems before. with this change fluxbox should compile on such
old compilers.
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/Font.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index 3b17fda..05dae54 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | 24 | ||
25 | #include "StringUtil.hh" | 25 | #include "StringUtil.hh" |
26 | #include "stringstream.hh" | ||
26 | #include "Font.hh" | 27 | #include "Font.hh" |
27 | #include "FontImp.hh" | 28 | #include "FontImp.hh" |
28 | #include "I18n.hh" | 29 | #include "I18n.hh" |
@@ -69,15 +70,6 @@ | |||
69 | #include <typeinfo> | 70 | #include <typeinfo> |
70 | #include <langinfo.h> | 71 | #include <langinfo.h> |
71 | 72 | ||
72 | #ifdef HAVE_SSTREAM | ||
73 | #include <sstream> | ||
74 | #define FB_istringstream istringstream | ||
75 | #elif HAVE_STRSTREAM | ||
76 | #include <strstream> | ||
77 | #define FB_istringstream istrstream | ||
78 | #else | ||
79 | #error "You dont have sstream or strstream headers!" | ||
80 | #endif // HAVE_STRSTREAM | ||
81 | 73 | ||
82 | #ifdef HAVE_CSTDLIB | 74 | #ifdef HAVE_CSTDLIB |
83 | #include <cstdlib> | 75 | #include <cstdlib> |
@@ -202,14 +194,14 @@ int extract_shadow_options(const std::string& opts, | |||
202 | } | 194 | } |
203 | else if ( (*token).find("offsetx=", 0) != std::string::npos ) { | 195 | else if ( (*token).find("offsetx=", 0) != std::string::npos ) { |
204 | size_t s= (*token).find_first_of('='); | 196 | size_t s= (*token).find_first_of('='); |
205 | FB_istringstream o((*token).substr(s + 1, (*token).length())); | 197 | FbTk_istringstream o((*token).substr(s + 1, (*token).length()).c_str()); |
206 | if ( !o.eof() ) { | 198 | if ( !o.eof() ) { |
207 | o >> offx; | 199 | o >> offx; |
208 | } | 200 | } |
209 | } | 201 | } |
210 | else if ( (*token).find("offsety=", 0) != std::string::npos ) { | 202 | else if ( (*token).find("offsety=", 0) != std::string::npos ) { |
211 | size_t s= (*token).find_first_of('='); | 203 | size_t s= (*token).find_first_of('='); |
212 | FB_istringstream o((*token).substr(s + 1, (*token).length())); | 204 | FbTk_istringstream o((*token).substr(s + 1, (*token).length()).c_str()); |
213 | if ( !o.eof() ) { | 205 | if ( !o.eof() ) { |
214 | o >> offy; | 206 | o >> offy; |
215 | } | 207 | } |