Merge branch 'curt/make' into next

[flightgear.git] / src / Main / logger.cxx

diff --git a/src/Main/logger.cxx b/src/Main/logger.cxx
index 47187c6239efb154a368c18c24940bbf6b87e86c..95e0a5dbe0bc950210c5559ad17611e7b9fbe5b3 100644 (file)
--- a/src/Main/logger.cxx
+++ b/src/Main/logger.cxx
@@ -3,20 +3,21 @@
 //
 // This file is in the Public Domain, and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "logger.hxx"
 
-#include STL_FSTREAM
+#include <fstream>
 #include <string>
 
-SG_USING_STD(ofstream);
-SG_USING_STD(endl);
-SG_USING_STD(string);
-
 #include <simgear/debug/logstream.hxx>
 
 #include "fg_props.hxx"
 
-
+using std::string;
+using std::endl;
 \f
 ////////////////////////////////////////////////////////////////////////
 // Implementation of FGLogger
@@ -72,7 +73,7 @@ FGLogger::init ()
     //
     // Process the individual entries (Time is automatic).
     //
-    vector<SGPropertyNode_ptr> entries = child->getChildren("entry");
+    std::vector<SGPropertyNode_ptr> entries = child->getChildren("entry");
     (*log.output) << "Time";
     for (unsigned int j = 0; j < entries.size(); j++) {
       SGPropertyNode * entry = entries[j];