Moved random ground cover object management code (userdata.[ch]xx) over

[flightgear.git] / src / Navaids / nav.hxx

diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index fb963b10b6f39c40e3a981024046754be51a0c52..2bfff9f1e85db8b3e641841201191b3d46e33887 100644 (file)
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -34,17 +34,13 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
+#elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
 
 
 class FGNav {
@@ -83,15 +79,6 @@ public:
     inline string get_trans_ident() { return trans_ident; }
     inline double get_magvar () const { return magvar; }
 
-    /* inline void set_type( char t ) { type = t; }
-    inline void set_lon( double l ) { lon = l; }
-    inline void set_lat( double l ) { lat = l; }
-    inline void set_elev( double e ) { elev = e; }
-    inline void set_freq( int f ) { freq = f; }
-    inline void set_range( int r ) { range = r; }
-    inline void set_dme( bool b ) { dme = b; }
-    inline void set_ident( char *i ) { strncpy( ident, i, 5 ); } */
-
     friend istream& operator>> ( istream&, FGNav& );
 };