Merge branch 'maint2' into next

[flightgear.git] / src / Instrumentation / dme.hxx

diff --git a/src/Instrumentation/dme.hxx b/src/Instrumentation/dme.hxx
index 1fc5781c6601b7db2d96ab4af9e544342110457b..5d9963b10d8466c577d6e55f4de718ed78dbe002 100644 (file)
--- a/src/Instrumentation/dme.hxx
+++ b/src/Instrumentation/dme.hxx
@@ -7,11 +7,6 @@
 #ifndef __INSTRUMENTS_DME_HXX
 #define __INSTRUMENTS_DME_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
@@ -42,7 +37,6 @@ class DME : public SGSubsystem
 public:
 
     DME ( SGPropertyNode *node );
-    DME ();
     virtual ~DME ();
 
     virtual void init ();
@@ -71,13 +65,13 @@ private:
     double _time_before_search_sec;
 
     bool _transmitter_valid;
-    Point3D _transmitter;
+    SGVec3d _transmitter;
     double _transmitter_elevation_ft;
     double _transmitter_range_nm;
     double _transmitter_bias;
 
-    string name;
-    int num;
+    string _name;
+    int _num;
 
 };