#include <simgear/compiler.h>
#include <algorithm> // sort()
-#include <stdlib.h> // atoi() atof()
-
-#include STL_STRING
+#include <cstdlib> // atoi() atof()
+#include <cstring>
+#include <string>
#include <simgear/debug/logstream.hxx>
#include <simgear/io/iochannel.hxx>
#include "httpd.hxx"
-SG_USING_STD(string);
+using std::string;
bool FGHttpd::open() {
if ( is_enabled() ) {
bool FGHttpd::process() {
- netChannel::poll();
+ simgear::NetChannel::poll();
return true;
}
if ( !globals->get_commands()
->execute(urlDecode(b).c_str(), &args) )
{
- SG_LOG( SG_GENERAL, SG_ALERT,
+ SG_LOG( SG_NETWORK, SG_ALERT,
"Command " << urlDecode(b)
<< " failed.");
}
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() );