Merge branch 'jmt/magvar' into next

[simgear.git] / simgear / route / routetest.cxx

diff --git a/simgear/route/routetest.cxx b/simgear/route/routetest.cxx
index dc586c0afad3596866097157825976aea1fb4613..3d59e0de6668faa06fa03dadccfd6e4d6b72906a 100644 (file)
--- a/simgear/route/routetest.cxx
+++ b/simgear/route/routetest.cxx
@@ -1,13 +1,13 @@
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "route.hxx"
 #include "waypoint.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 void dump_route(const SGRoute& route, const char* message)
 {
@@ -23,7 +23,7 @@ void dump_route(const SGRoute& route, const char* message)
 int main()
 {
     SGRoute route;
-
+/*
     route.add_waypoint( SGWayPoint(0, 0, 0, SGWayPoint::CARTESIAN, "Start") );
     route.add_waypoint( SGWayPoint(1, 0, 0, SGWayPoint::CARTESIAN, "1") );
     route.add_waypoint( SGWayPoint(2, 0, 0, SGWayPoint::CARTESIAN, "2") );
@@ -48,6 +48,6 @@ int main()
 
     route.add_waypoint(wp2, 3);
     dump_route(route, "added back WP2 after WP3");
-
+*/
     return 0;
 }