X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Flogger.hxx;h=c1b56b2643c19fed9a0c7b95cd2c858537c5ba99;hb=32b9c6152817326666c5d29e28c334c0559b088e;hp=fe2bc7948db8e33704a40d2a7137f42d0fa04c78;hpb=62ed7592e3e0044daff60fbc83b0404d4fa9a896;p=flightgear.git

diff --git a/src/Main/logger.hxx b/src/Main/logger.hxx
index fe2bc7948..c1b56b264 100644
--- a/src/Main/logger.hxx
+++ b/src/Main/logger.hxx
@@ -6,45 +6,29 @@
 #ifndef __LOGGER_HXX
 #define __LOGGER_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <simgear/compiler.h>
-#include <simgear/debug/logstream.hxx>
-#include <simgear/misc/exception.hxx>
-#include <simgear/misc/props.hxx>
-
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
-#include <iostream>
-SG_USING_STD(ostream);
-#endif
-
+#include <iosfwd>
 #include <vector>
-SG_USING_STD(vector);
-
-#include "fgfs.hxx"
 
+#include <simgear/compiler.h>
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/props/props.hxx>
 
 /**
  * Log any property values to any number of CSV files.
  */
-class FGLogger : public FGSubsystem
+class FGLogger : public SGSubsystem
 {
 public:
 
   FGLogger ();
   virtual ~FGLogger ();
 
-				// Implementation of FGSubsystem
+				// Implementation of SGSubsystem
   virtual void init ();
+  virtual void reinit ();
   virtual void bind ();
   virtual void unbind ();
-  virtual void update (int dt);
+  virtual void update (double dt);
 
 private:
 
@@ -54,14 +38,14 @@ private:
   struct Log {
     Log ();
     virtual ~Log ();
-    vector<SGPropertyNode *> nodes;
-    ostream * output;
+    std::vector<SGPropertyNode_ptr> nodes;
+    std::ostream * output;
     long interval_ms;
-    long last_time_ms;
+    double last_time_ms;
     char delimiter;
   };
 
-  vector<Log> _logs;
+  std::vector<Log> _logs;
 
 };