Merge branch 'vivian/train' into next

[flightgear.git] / src / Main / viewer.hxx

diff --git a/src/Main/viewer.hxx b/src/Main/viewer.hxx
index 455f8f1fd4fd9f9b7bd10b28d9aee612f7057ec1..965e8569a8a8cb3cdf8bb6829c482522f375908c 100644 (file)
--- a/src/Main/viewer.hxx
+++ b/src/Main/viewer.hxx
@@ -25,12 +25,7 @@
 
 
 #ifndef _VIEWER_HXX
-#define _VIEWER_HXX
-
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
+#define _VIEWER_HXX                                
 
 namespace flightgear
 {
@@ -103,13 +98,9 @@ public:
     //   pilot view, model in model view).
     //   FIXME: the model view position (ie target positions) 
     //   should be in the model class.
-    virtual double getLongitude_deg () const { return _position.getLongitudeDeg(); }
-    virtual double getLatitude_deg () const { return _position.getLatitudeDeg(); }
- 
     virtual void setPosition (double lon_deg, double lat_deg, double alt_ft);
     const SGGeod& getPosition() const { return _position; }
 
-
     // Reference geodetic target position...
     virtual void setTargetPosition (double lon_deg, double lat_deg, double alt_ft);
     const SGGeod& getTargetPosition() const { return _target; }