Merge branch 'jmt/track-bug' into next

[flightgear.git] / src / Network / httpd.cxx

diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx
index feee746eafeea751f3fdbb9ad254124590f0b189..7adc4214d7a2cfff8c7dd35ef042aee738f192f7 100644 (file)
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -34,7 +34,7 @@
 #include <algorithm>           // sort()
 #include <stdlib.h>            // atoi() atof()
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -47,9 +47,7 @@
 
 #include "httpd.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(cout);
-
+using std::string;
 
 bool FGHttpd::open() {
     if ( is_enabled() ) {
@@ -269,7 +267,7 @@ void HttpdChannel::foundTerminator (void) {
         
         SG_LOG( SG_IO, SG_INFO, "size = " << response.length() );
         char ctmp[256];
-        sprintf(ctmp, "Content-Length: %d", response.length());
+        sprintf(ctmp, "Content-Length: %u", (unsigned)response.length());
         push( ctmp );
         push( getTerminator() );