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

[flightgear.git] / src / Airports / simple.hxx

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index a3c75799356e85008c827a5b80481e239166b925..288586417fc38943862b132bf1ced9e3edf567b2 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -38,35 +38,15 @@
 
 #include <simgear/compiler.h>
 
-#ifdef FG_HAVE_STD_INCLUDES
-#  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
-#  include <iostream>
-#else
-#  include <istream.h>
-#endif
-
 #include STL_STRING
 #include <set>
 
-#ifndef _MSC_VER
-#   define NDEBUG                      // she don't work without it.
-#endif
-#include <mk4.h>
-#include <mk4str.h>
-#ifndef _MSC_VER
-#  undef NDEBUG
-#endif
-
-FG_USING_STD(string);
-FG_USING_STD(set);
-
-#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-FG_USING_STD(istream);
-#endif
+// Forward declarations.
+class c4_Storage;
+class c4_View;
 
+SG_USING_STD(string);
+SG_USING_STD(set);
 
 class FGAirport {
 
@@ -91,12 +71,6 @@ public:
 
 };
 
-inline istream&
-operator >> ( istream& in, FGAirport& a )
-{
-    return in >> a.id >> a.latitude >> a.longitude >> a.elevation;
-}
-
 
 class FGAirports {
 
@@ -124,7 +98,7 @@ public:
 
 class FGAirportsUtil {
 public:
-#ifdef FG_NO_DEFAULT_TEMPLATE_ARGS
+#ifdef SG_NO_DEFAULT_TEMPLATE_ARGS
     typedef set< FGAirport, less< FGAirport > > container;
 #else
     typedef set< FGAirport > container;