Rembrandt: Restore rendering stats

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

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index 2cd15b5b008a7fa9e10d339a7c17f7eafb4acecf..9b5b3da8b148076cb969b2755dc6d8b8d71037ba 100644 (file)
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -17,10 +17,10 @@
 //
 // $Id$
 
-#ifdef HAVE_CONFIG_H\r
-#  include <config.h>\r
-#endif\r
-\r
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #include <math.h>
@@ -28,7 +28,6 @@
 #include <cstdlib>
 
 #include <vector>
-using std::vector;
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/SGLimits.hxx>
@@ -43,6 +42,8 @@ using std::vector;
 #include "osgDB/Registry"
 #endif
 
+using std::vector;
+
 // Originally written by Alex Perry.
 double
 fgGetLowPass (double current, double target, double timeratio)
@@ -71,10 +72,10 @@ fgGetLowPass (double current, double target, double timeratio)
 }
 
 
-string
+std::string
 fgUnescape (const char *s)
 {
-    string r;
+    std::string r;
     while (*s) {
         if (*s != '\\') {
             r += *s++;