From dc5a58fdcf3f316a16dd293d24c1da4c689b0d9b Mon Sep 17 00:00:00 2001 From: ehofman Date: Mon, 26 Jan 2004 20:33:30 +0000 Subject: [PATCH] Alexander Nedotsukov: I just met a couple of warnings about depricated headers beeng used. Please take a look at patch (against today cvs) attached wich does strstream -> stringstream migration. I hope you found it usefull. --- src/Network/httpd.cxx | 2 -- src/Network/jpg-httpd.cxx | 3 --- src/Network/props.cxx | 10 +++++----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx index 318c69f2a..5b591b99f 100644 --- a/src/Network/httpd.cxx +++ b/src/Network/httpd.cxx @@ -34,7 +34,6 @@ #include // atoi() atof() #include STL_STRING -#include STL_STRSTREAM #include #include @@ -49,7 +48,6 @@ SG_USING_STD(string); SG_USING_STD(cout); -SG_USING_STD(istrstream); bool FGHttpd::open() { diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx index 97433a1c9..e24edc479 100644 --- a/src/Network/jpg-httpd.cxx +++ b/src/Network/jpg-httpd.cxx @@ -34,7 +34,6 @@ #include // atoi() atof() #include STL_STRING -#include STL_STRSTREAM #include #include @@ -47,8 +46,6 @@ #include "jpg-httpd.hxx" SG_USING_STD(string); -SG_USING_STD(cout); -SG_USING_STD(istrstream); bool FGJpegHttpd::open() { diff --git a/src/Network/props.cxx b/src/Network/props.cxx index b0526c8ab..47f53aa75 100644 --- a/src/Network/props.cxx +++ b/src/Network/props.cxx @@ -34,7 +34,7 @@ #include #include -#include STL_STRSTREAM +#include #include
#include
@@ -43,7 +43,7 @@ #include "props.hxx" -SG_USING_STD(strstream); +SG_USING_STD(stringstream); SG_USING_STD(ends); /** @@ -211,18 +211,18 @@ PropsChannel::foundTerminator() push( line.c_str() ); } } else if ( command == "dump" ) { - strstream buf; + stringstream buf; if ( tokens.size() <= 1 ) { writeProperties( buf, node ); buf << ends; // null terminate the string - push( buf.str() ); + push( buf.str().c_str() ); push( getTerminator() ); } else { SGPropertyNode *child = node->getNode( tokens[1].c_str() ); if ( child ) { writeProperties ( buf, child ); buf << ends; // null terminate the string - push( buf.str() ); + push( buf.str().c_str() ); push( getTerminator() ); } else { node_not_found_error( tokens[1] ); -- 2.39.5