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.

diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx
index 318c69f2a592f4da229a56e22f26180c4c469a96..5b591b99f7e3bc7ca2e49bf81969922b9e7686e1 100644 (file)
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -34,7 +34,6 @@
 #include <stdlib.h>            // atoi() atof()
 
 #include STL_STRING
-#include STL_STRSTREAM
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -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 97433a1c96ec21e8ebd31510c0f639b1a5465faa..e24edc479c9151516e31602331c7e59ed6ebc0a6 100644 (file)
--- a/src/Network/jpg-httpd.cxx
+++ b/src/Network/jpg-httpd.cxx
@@ -34,7 +34,6 @@
 #include <stdlib.h>            // atoi() atof()
 
 #include STL_STRING
-#include STL_STRSTREAM
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -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 b0526c8ab254a9ec179b2e5cc3446530105e4916..47f53aa75941d4afcdae448b80ba66a912240af1 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -34,7 +34,7 @@
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
 
-#include STL_STRSTREAM
+#include <sstream>
 
 #include <Main/globals.hxx>
 #include <Main/viewmgr.hxx>
@@ -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] );