From 426f6de16f525a7e603338a091ab191c132e3ba0 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Tue, 29 Jul 2008 08:25:17 +0000
Subject: [PATCH] final fixes for SG_USING_STD removal

---
 simgear/compiler.h                  | 5 -----
 simgear/io/sg_binobj.cxx            | 5 ++---
 simgear/props/props.cxx             | 6 +++---
 simgear/sound/sample_openal.hxx     | 2 +-
 simgear/structure/subsystem_mgr.hxx | 7 ++++---
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 7d2e6da5..da0020cc 100644
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -141,10 +141,5 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
 // No user modifiable definitions beyond here.
 //
 
-/** \def SG_USING_STD(x)
- *  Expands to using std::X
- */
-#  define SG_USING_STD(X) using std::X
-
 #endif // _SG_COMPILER_H
 
diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx
index 692ee56a..3c321308 100644
--- a/simgear/io/sg_binobj.cxx
+++ b/simgear/io/sg_binobj.cxx
@@ -43,9 +43,8 @@
 #include "sg_binobj.hxx"
 
 
-SG_USING_STD( string );
-SG_USING_STD( vector );
-
+using std::string;
+using std::vector;
 using std::cout;
 using std::endl;
 
diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx
index a4f78ab0..48b1d2c9 100644
--- a/simgear/props/props.cxx
+++ b/simgear/props/props.cxx
@@ -23,9 +23,9 @@
 
 #if ( _MSC_VER == 1200 )
 // MSVC 6 is buggy, and needs something strange here
-SG_USING_STD(vector<SGPropertyNode_ptr>);
-SG_USING_STD(vector<SGPropertyChangeListener *>);
-SG_USING_STD(vector<SGPropertyNode *>);
+using std::vector<SGPropertyNode_ptr>;
+using std::vector<SGPropertyChangeListener *>;
+using std::vector<SGPropertyNode *>;
 #endif
 #endif
 
diff --git a/simgear/sound/sample_openal.hxx b/simgear/sound/sample_openal.hxx
index 2653931d..a00de04e 100644
--- a/simgear/sound/sample_openal.hxx
+++ b/simgear/sound/sample_openal.hxx
@@ -63,7 +63,7 @@
  #define USE_SOFTWARE_DOPPLER seem to be necessary
 #endif
 
-SG_USING_STD(string);
+using std::string;
 
 /**
  * manages everything we need to know for an individual sound sample
diff --git a/simgear/structure/subsystem_mgr.hxx b/simgear/structure/subsystem_mgr.hxx
index e7633514..c759e790 100644
--- a/simgear/structure/subsystem_mgr.hxx
+++ b/simgear/structure/subsystem_mgr.hxx
@@ -28,9 +28,10 @@
 #include <string>
 #include <map>
 #include <vector>
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+
+using std::map;
+using std::vector;
+using std::string;
 
 #include <simgear/props/props.hxx>
 #include <simgear/timing/timestamp.hxx>
-- 
2.39.5