From: ehofman <ehofman>
Date: Mon, 28 Jul 2008 07:52:13 +0000 (+0000)
Subject: Replace SG_USE_STD() by using std::
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d4c7e950927b1e19a7a7622a7919f32233a6b7a8;p=simgear.git

Replace SG_USE_STD() by using std::
---

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index 80f1892c..c79f7766 100644
--- a/simgear/debug/logstream.hxx
+++ b/simgear/debug/logstream.hxx
@@ -36,8 +36,8 @@
 
 #include <simgear/debug/debug_types.h>
 
-SG_USING_STD(streambuf);
-SG_USING_STD(ostream);
+using std::streambuf;
+using std::ostream;
 
 //
 // TODO:
diff --git a/simgear/environment/metar.hxx b/simgear/environment/metar.hxx
index f255e103..b6439a27 100644
--- a/simgear/environment/metar.hxx
+++ b/simgear/environment/metar.hxx
@@ -29,9 +29,9 @@
 
 #include <simgear/constants.h>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::vector;
+using std::map;
+using std::string;
 
 const double SGMetarNaN = -1E20;
 #define NaN SGMetarNaN
diff --git a/simgear/environment/visual_enviro.cxx b/simgear/environment/visual_enviro.cxx
index 8142b3e5..dbc251e8 100644
--- a/simgear/environment/visual_enviro.cxx
+++ b/simgear/environment/visual_enviro.cxx
@@ -38,7 +38,7 @@
 
 #include <vector>
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 typedef struct {
diff --git a/simgear/environment/visual_enviro.hxx b/simgear/environment/visual_enviro.hxx
index b5bec163..42d2e3a5 100644
--- a/simgear/environment/visual_enviro.hxx
+++ b/simgear/environment/visual_enviro.hxx
@@ -28,8 +28,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 class SGLightning;
 class SGSoundMgr;
diff --git a/simgear/ephemeris/stardata.cxx b/simgear/ephemeris/stardata.cxx
index bba1a536..13df0cc1 100644
--- a/simgear/ephemeris/stardata.cxx
+++ b/simgear/ephemeris/stardata.cxx
@@ -31,7 +31,7 @@
 #include "stardata.hxx"
 
 #if defined (_MSC_VER)
-  SG_USING_STD(getline);
+  using std::getline;
 #endif
 
 // Constructor
diff --git a/simgear/io/decode_binobj.cxx b/simgear/io/decode_binobj.cxx
index f2af87d8..302648bd 100644
--- a/simgear/io/decode_binobj.cxx
+++ b/simgear/io/decode_binobj.cxx
@@ -9,8 +9,8 @@
 
 #include "sg_binobj.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 
 int main( int argc, char **argv ) {
diff --git a/simgear/io/iochannel.hxx b/simgear/io/iochannel.hxx
index a81ca467..d8a29608 100644
--- a/simgear/io/iochannel.hxx
+++ b/simgear/io/iochannel.hxx
@@ -35,8 +35,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 
 #define SG_IO_MAX_MSG_SIZE 16384
diff --git a/simgear/io/lowtest.cxx b/simgear/io/lowtest.cxx
index 91113cb1..eae27f34 100644
--- a/simgear/io/lowtest.cxx
+++ b/simgear/io/lowtest.cxx
@@ -8,8 +8,8 @@ static const int sgEndianTest = 1;
 #define sgIsLittleEndian (*((char *) &sgEndianTest ) != 0)
 #define sgIsBigEndian    (*((char *) &sgEndianTest ) == 0)
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 
 int main() {
diff --git a/simgear/io/sg_file.cxx b/simgear/io/sg_file.cxx
index df96aa8e..213a1790 100644
--- a/simgear/io/sg_file.cxx
+++ b/simgear/io/sg_file.cxx
@@ -36,7 +36,7 @@
 
 #include "sg_file.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 SGFile::SGFile(const string &file, bool repeat_)
diff --git a/simgear/io/sg_file.hxx b/simgear/io/sg_file.hxx
index 2eb87d42..a64dd6ee 100644
--- a/simgear/io/sg_file.hxx
+++ b/simgear/io/sg_file.hxx
@@ -44,7 +44,7 @@
 
 #include "iochannel.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**
diff --git a/simgear/io/sg_serial.cxx b/simgear/io/sg_serial.cxx
index e2e068f8..b7b2f5a9 100644
--- a/simgear/io/sg_serial.cxx
+++ b/simgear/io/sg_serial.cxx
@@ -32,7 +32,7 @@
 
 #include "sg_serial.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 SGSerial::SGSerial( const string& device_name, const string& baud_rate ) :
diff --git a/simgear/io/sg_serial.hxx b/simgear/io/sg_serial.hxx
index d1c22ab9..85a92e1c 100644
--- a/simgear/io/sg_serial.hxx
+++ b/simgear/io/sg_serial.hxx
@@ -40,7 +40,7 @@
 
 #include "iochannel.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 /**
  * A serial I/O class based on SGIOChannel.
diff --git a/simgear/io/sg_socket.hxx b/simgear/io/sg_socket.hxx
index 40ffde38..78c9d2d8 100644
--- a/simgear/io/sg_socket.hxx
+++ b/simgear/io/sg_socket.hxx
@@ -41,7 +41,7 @@
 
 #include <plib/netSocket.h>
 
-SG_USING_STD(string);
+using std::string;
 
 #define SG_MAX_SOCKET_QUEUE 32
 
diff --git a/simgear/io/sg_socket_udp.hxx b/simgear/io/sg_socket_udp.hxx
index d9006fe6..9d8e8eb6 100644
--- a/simgear/io/sg_socket_udp.hxx
+++ b/simgear/io/sg_socket_udp.hxx
@@ -41,7 +41,7 @@
 #include <simgear/math/sg_types.hxx>
 #include <simgear/io/iochannel.hxx>
 
-SG_USING_STD(string);
+using std::string;
 
 /**
  * A UDP socket I/O class based on SGIOChannel and plib/net.
diff --git a/simgear/io/socktest.cxx b/simgear/io/socktest.cxx
index ed654981..83adfd27 100644
--- a/simgear/io/socktest.cxx
+++ b/simgear/io/socktest.cxx
@@ -14,8 +14,8 @@ static const int sgEndianTest = 1;
 #define sgIsLittleEndian (*((char *) &sgEndianTest ) != 0)
 #define sgIsBigEndian    (*((char *) &sgEndianTest ) == 0)
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 
 int main() {
diff --git a/simgear/io/tcp_server.cxx b/simgear/io/tcp_server.cxx
index 89161f53..01c949da 100644
--- a/simgear/io/tcp_server.cxx
+++ b/simgear/io/tcp_server.cxx
@@ -5,8 +5,8 @@
 
 #include "sg_socket.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(cout);
+using std::string;
+using std::cout;
 
 class TcpServer
 {
diff --git a/simgear/math/interpolater.cxx b/simgear/math/interpolater.cxx
index 6502ba5a..2b6824f2 100644
--- a/simgear/math/interpolater.cxx
+++ b/simgear/math/interpolater.cxx
@@ -33,7 +33,7 @@
 
 #include "interpolater.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 // Constructor -- starts with an empty table.
 SGInterpTable::SGInterpTable()
diff --git a/simgear/math/interpolater.hxx b/simgear/math/interpolater.hxx
index 06ed3832..0df566a9 100644
--- a/simgear/math/interpolater.hxx
+++ b/simgear/math/interpolater.hxx
@@ -40,7 +40,7 @@
 #include <map>
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 class SGPropertyNode;
 
diff --git a/simgear/math/sg_types.hxx b/simgear/math/sg_types.hxx
index e629a55a..4698acec 100644
--- a/simgear/math/sg_types.hxx
+++ b/simgear/math/sg_types.hxx
@@ -40,8 +40,8 @@
 
 #include <simgear/math/point3d.hxx>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 /** STL vector list of ints */
 typedef vector < int > int_list;
diff --git a/simgear/misc/sg_path.hxx b/simgear/misc/sg_path.hxx
index db3b300d..70f1b6c5 100644
--- a/simgear/misc/sg_path.hxx
+++ b/simgear/misc/sg_path.hxx
@@ -35,7 +35,7 @@
 
 #include <simgear/math/sg_types.hxx>
 
-SG_USING_STD(string);
+using std::string;
 
 #ifdef _MSC_VER
   typedef int mode_t;
diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index 59051df4..aa395a25 100644
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -32,11 +32,11 @@
 #include <string>
 
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 #include <cstdlib>
 
-SG_USING_STD(string);
+using std::string;
 
 namespace simgear {
     namespace strutils {
diff --git a/simgear/misc/tabbed_values.hxx b/simgear/misc/tabbed_values.hxx
index cc7335f7..146ba368 100644
--- a/simgear/misc/tabbed_values.hxx
+++ b/simgear/misc/tabbed_values.hxx
@@ -28,8 +28,8 @@
 #include <vector>
 #include <string>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 class SGTabbedValues
 {
diff --git a/simgear/misc/tabbed_values_test.cxx b/simgear/misc/tabbed_values_test.cxx
index 53bba88d..64f3b602 100644
--- a/simgear/misc/tabbed_values_test.cxx
+++ b/simgear/misc/tabbed_values_test.cxx
@@ -7,9 +7,9 @@
 #include <iostream>
 #include "tabbed_values.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(cerr);
-SG_USING_STD(endl);
+using std::cout;
+using std::cerr;
+using std::endl;
 
 
 int main (int ac, char ** av)
diff --git a/simgear/misc/texcoord.cxx b/simgear/misc/texcoord.cxx
index afd0ceac..2705980d 100644
--- a/simgear/misc/texcoord.cxx
+++ b/simgear/misc/texcoord.cxx
@@ -149,8 +149,8 @@ enter this in the official comments in case I forget again. :-)
 
 #include "texcoord.hxx"
 
-// SG_USING_STD(cout);
-// SG_USING_STD(endl);
+// using std::cout;
+// using std::endl;
 
 
 #define FG_STANDARD_TEXTURE_DIMENSION 1000.0 // meters
diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx
index 482197ce..da4f20f9 100644
--- a/simgear/props/condition.cxx
+++ b/simgear/props/condition.cxx
@@ -18,8 +18,8 @@
 #include "props.hxx"
 #include "condition.hxx"
 
-SG_USING_STD(istream);
-SG_USING_STD(ostream);
+using std::istream;
+using std::ostream;
 
 
 
diff --git a/simgear/props/props_io.cxx b/simgear/props/props_io.cxx
index b706c678..cfd99deb 100644
--- a/simgear/props/props_io.cxx
+++ b/simgear/props/props_io.cxx
@@ -30,13 +30,13 @@
 #include <vector>
 #include <map>
 
-SG_USING_STD(istream);
-SG_USING_STD(ifstream);
-SG_USING_STD(ostream);
-SG_USING_STD(ofstream);
-SG_USING_STD(string);
-SG_USING_STD(vector);
-SG_USING_STD(map);
+using std::istream;
+using std::ifstream;
+using std::ostream;
+using std::ofstream;
+using std::string;
+using std::vector;
+using std::map;
 
 using std::endl;
 
diff --git a/simgear/props/props_test.cxx b/simgear/props/props_test.cxx
index ccbf1afe..7e67e352 100644
--- a/simgear/props/props_test.cxx
+++ b/simgear/props/props_test.cxx
@@ -9,9 +9,9 @@
 #include "props.hxx"
 #include "props_io.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(cerr);
-SG_USING_STD(endl);
+using std::cout;
+using std::cerr;
+using std::endl;
 
 
 
diff --git a/simgear/route/route.hxx b/simgear/route/route.hxx
index 6e6c5805..0b3701f1 100644
--- a/simgear/route/route.hxx
+++ b/simgear/route/route.hxx
@@ -36,7 +36,7 @@
 
 #include <vector>
 
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/route/waypoint.hxx>
 
diff --git a/simgear/route/routetest.cxx b/simgear/route/routetest.cxx
index 3a0b5853..4c10e7ee 100644
--- a/simgear/route/routetest.cxx
+++ b/simgear/route/routetest.cxx
@@ -6,8 +6,8 @@
 #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)
 {
diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index 6f37fa56..206dcb3b 100644
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -37,7 +37,7 @@
 
 #include <string>
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**
diff --git a/simgear/route/waytest.cxx b/simgear/route/waytest.cxx
index f3c428c9..f0debfd9 100644
--- a/simgear/route/waytest.cxx
+++ b/simgear/route/waytest.cxx
@@ -5,8 +5,8 @@
 
 #include "waypoint.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 int main() {
     SGWayPoint a1(-93.216923, 44.880547, 0.0, SGWayPoint::WGS84, "KMSP");
diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 8edb5206..cd0bcee0 100644
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -29,7 +29,7 @@
 
 #include <string.h>
 #include <map>
-SG_USING_STD(map);
+using std::map;
 
 #include <plib/ul.h>
 
diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index 621f7940..332197a1 100644
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -47,9 +47,9 @@
 
 #include "matmodel.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
-SG_USING_STD(map);
+using std::string;
+using std::vector;
+using std::map;
 
 
 class SGMaterialGlyph;
diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index de8e6241..6aa82d4e 100644
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -60,7 +60,7 @@
 
 #include "matlib.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 // Constructor
 SGMaterialLib::SGMaterialLib ( void ) {
diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 9c96523b..94f47881 100644
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -43,10 +43,10 @@
 class SGMaterial;
 class SGPropertyNode;
 
-SG_USING_STD(string);
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(less);
+using std::string;
+using std::map;
+using std::vector;
+using std::less;
 
 // Material management class
 class SGMaterialLib {
diff --git a/simgear/scene/material/matmodel.cxx b/simgear/scene/material/matmodel.cxx
index 1b3204da..47fe1e09 100644
--- a/simgear/scene/material/matmodel.cxx
+++ b/simgear/scene/material/matmodel.cxx
@@ -28,7 +28,7 @@
 #include <simgear/compiler.h>
 
 #include <map>
-SG_USING_STD(map);
+using std::map;
 
 #include <osg/AlphaFunc>
 #include <osg/Group>
diff --git a/simgear/scene/model/model.cxx b/simgear/scene/model/model.cxx
index cdd50861..aece3e2d 100644
--- a/simgear/scene/model/model.cxx
+++ b/simgear/scene/model/model.cxx
@@ -20,7 +20,7 @@
 
 #include "model.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 osg::Texture2D*
 SGLoadTexture2D(bool staticTexture, const std::string& path,
diff --git a/simgear/scene/model/model.hxx b/simgear/scene/model/model.hxx
index 1de3bf40..9f930f3e 100644
--- a/simgear/scene/model/model.hxx
+++ b/simgear/scene/model/model.hxx
@@ -15,8 +15,8 @@
 #include <vector>
 #include <set>
 
-SG_USING_STD(vector);
-SG_USING_STD(set);
+using std::vector;
+using std::set;
 
 #include <osg/Node>
 #include <osg/Texture2D>
diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index 806b7f23..f40ba92e 100644
--- a/simgear/scene/model/modellib.hxx
+++ b/simgear/scene/model/modellib.hxx
@@ -30,8 +30,8 @@
 
 #include <simgear/props/props.hxx>
 
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::map;
+using std::string;
 
 namespace simgear {
 
diff --git a/simgear/scene/model/shadowvolume.hxx b/simgear/scene/model/shadowvolume.hxx
index 8f5ebcde..1f4f3f56 100644
--- a/simgear/scene/model/shadowvolume.hxx
+++ b/simgear/scene/model/shadowvolume.hxx
@@ -29,8 +29,8 @@
 #include <vector>
 #include <map>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
+using std::vector;
+using std::map;
 
 class ssgBranch;
 class ssgLeaf;
diff --git a/simgear/scene/sky/cloud.hxx b/simgear/scene/sky/cloud.hxx
index 663ade3b..fd0722c6 100644
--- a/simgear/scene/sky/cloud.hxx
+++ b/simgear/scene/sky/cloud.hxx
@@ -33,7 +33,7 @@
 #include <simgear/structure/SGReferenced.hxx>
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 #include <osg/ref_ptr>
 #include <osg/Array>
diff --git a/simgear/scene/sky/cloudfield.cxx b/simgear/scene/sky/cloudfield.cxx
index 2c048a97..d0097dcb 100644
--- a/simgear/scene/sky/cloudfield.cxx
+++ b/simgear/scene/sky/cloudfield.cxx
@@ -34,7 +34,7 @@
 #include <algorithm>
 #include <vector>
 
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/environment/visual_enviro.hxx>
 #include "sky.hxx"
diff --git a/simgear/scene/sky/cloudfield.hxx b/simgear/scene/sky/cloudfield.hxx
index 5016c632..fc358688 100644
--- a/simgear/scene/sky/cloudfield.hxx
+++ b/simgear/scene/sky/cloudfield.hxx
@@ -28,7 +28,7 @@
 #include <vector>
 
 
-SG_USING_STD(vector);
+using std::vector;
 
 class SGNewCloud;
 
diff --git a/simgear/scene/sky/newcloud.hxx b/simgear/scene/sky/newcloud.hxx
index adda37ee..b3a2846f 100644
--- a/simgear/scene/sky/newcloud.hxx
+++ b/simgear/scene/sky/newcloud.hxx
@@ -30,8 +30,8 @@
 
 #include "bbcache.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 /**
  * 3D cloud class.
diff --git a/simgear/scene/sky/sky.hxx b/simgear/scene/sky/sky.hxx
index d842b9b7..46c30284 100644
--- a/simgear/scene/sky/sky.hxx
+++ b/simgear/scene/sky/sky.hxx
@@ -50,7 +50,7 @@
 #include <simgear/scene/sky/oursun.hxx>
 #include <simgear/scene/sky/stars.hxx>
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 typedef struct {
diff --git a/simgear/scene/tgdb/TileCache.hxx b/simgear/scene/tgdb/TileCache.hxx
index 6e137d0a..f3c8a582 100644
--- a/simgear/scene/tgdb/TileCache.hxx
+++ b/simgear/scene/tgdb/TileCache.hxx
@@ -30,7 +30,7 @@
 #include <simgear/math/point3d.hxx>
 #include <simgear/scene/tgdb/TileEntry.hxx>
 
-SG_USING_STD(map);
+using std::map;
 
 namespace simgear {
 
diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 79a1bf41..64f9c3e0 100644
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -62,7 +62,7 @@
 #include "ReaderWriterSTG.hxx"
 #include "TileEntry.hxx"
 
-SG_USING_STD(string);
+using std::string;
 using namespace simgear;
 
 ModelLoadHelper *TileEntry::_modelLoader=0;
diff --git a/simgear/scene/tgdb/TileEntry.hxx b/simgear/scene/tgdb/TileEntry.hxx
index cf0ffccc..eee74541 100644
--- a/simgear/scene/tgdb/TileEntry.hxx
+++ b/simgear/scene/tgdb/TileEntry.hxx
@@ -48,8 +48,8 @@
 #include <strings.h>
 #endif
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 namespace simgear {
 
diff --git a/simgear/scene/tgdb/apt_signs.cxx b/simgear/scene/tgdb/apt_signs.cxx
index 296a8d3e..4053dda1 100644
--- a/simgear/scene/tgdb/apt_signs.cxx
+++ b/simgear/scene/tgdb/apt_signs.cxx
@@ -41,7 +41,7 @@
 #define SIGN "OBJECT_SIGN: "
 #define RWY "OBJECT_RUNWAY_SIGN: "
 
-SG_USING_STD(vector);
+using std::vector;
 
 // for temporary storage of sign elements
 struct element_info {
diff --git a/simgear/scene/tgdb/apt_signs.hxx b/simgear/scene/tgdb/apt_signs.hxx
index 62282b41..8e3718a4 100644
--- a/simgear/scene/tgdb/apt_signs.hxx
+++ b/simgear/scene/tgdb/apt_signs.hxx
@@ -38,7 +38,7 @@
 
 class SGMaterialLib;            // forward declaration
 
-SG_USING_STD(string);
+using std::string;
 
 
 // Generate a generic sign
diff --git a/simgear/scene/tgdb/obj.hxx b/simgear/scene/tgdb/obj.hxx
index d9b2075d..126ed6cc 100644
--- a/simgear/scene/tgdb/obj.hxx
+++ b/simgear/scene/tgdb/obj.hxx
@@ -38,7 +38,7 @@
 
 #include "SGOceanTile.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 class SGBucket;
 class SGMaterialLib;
diff --git a/simgear/scene/tgdb/pt_lights.hxx b/simgear/scene/tgdb/pt_lights.hxx
index 9e95674e..5f831cbf 100644
--- a/simgear/scene/tgdb/pt_lights.hxx
+++ b/simgear/scene/tgdb/pt_lights.hxx
@@ -45,8 +45,8 @@
 #include "SGLightBin.hxx"
 #include "SGDirectionalLightBin.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 // Specify the way we want to draw directional point lights (assuming the
 // appropriate extensions are available.)
diff --git a/simgear/scene/tgdb/userdata.hxx b/simgear/scene/tgdb/userdata.hxx
index 5acf06a3..da0a4f5d 100644
--- a/simgear/scene/tgdb/userdata.hxx
+++ b/simgear/scene/tgdb/userdata.hxx
@@ -35,7 +35,7 @@
 #include <osg/Geometry>
 #include <osg/Group>
 
-SG_USING_STD(string);
+using std::string;
 
 class SGMaterial;
 class SGMatModel;
diff --git a/simgear/screen/shader.h b/simgear/screen/shader.h
index df767901..2bd3e8eb 100644
--- a/simgear/screen/shader.h
+++ b/simgear/screen/shader.h
@@ -29,9 +29,9 @@
 #include <map>
 #include <string>
 
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::map;
+using std::vector;
+using std::string;
 
 class Shader {
 public:
diff --git a/simgear/serial/serial.hxx b/simgear/serial/serial.hxx
index d2c1f838..83cc6008 100644
--- a/simgear/serial/serial.hxx
+++ b/simgear/serial/serial.hxx
@@ -38,7 +38,7 @@
 
 #include <simgear/compiler.h>
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 // if someone know how to do this all with C++ streams let me know
 // #include <stdio.h>
diff --git a/simgear/serial/testserial.cxx b/simgear/serial/testserial.cxx
index d82d993c..828be053 100644
--- a/simgear/serial/testserial.cxx
+++ b/simgear/serial/testserial.cxx
@@ -7,8 +7,8 @@
 
 #include "serial.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 int main () {
     SGSerialPort port;
diff --git a/simgear/sound/soundmgr_openal.hxx b/simgear/sound/soundmgr_openal.hxx
index d306f82e..477386e5 100644
--- a/simgear/sound/soundmgr_openal.hxx
+++ b/simgear/sound/soundmgr_openal.hxx
@@ -52,8 +52,8 @@
 
 #include "sample_openal.hxx"
 
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::map;
+using std::string;
 
 
 typedef map < string, SGSharedPtr<SGSoundSample> > sample_map;
diff --git a/simgear/structure/commands.hxx b/simgear/structure/commands.hxx
index 147c4f3d..21f44963 100644
--- a/simgear/structure/commands.hxx
+++ b/simgear/structure/commands.hxx
@@ -19,9 +19,9 @@
 
 #include <simgear/props/props.hxx>
 
-SG_USING_STD(string);
-SG_USING_STD(map);
-SG_USING_STD(vector);
+using std::string;
+using std::map;
+using std::vector;
 
 
 /**
diff --git a/simgear/structure/exception.hxx b/simgear/structure/exception.hxx
index e482be31..d3b37834 100644
--- a/simgear/structure/exception.hxx
+++ b/simgear/structure/exception.hxx
@@ -13,7 +13,7 @@
 #include <simgear/compiler.h>
 #include <string>
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**
diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
index 0779d872..65a35513 100644
--- a/simgear/xml/easyxml.cxx
+++ b/simgear/xml/easyxml.cxx
@@ -14,7 +14,7 @@
 #include <fstream>
 #include <iostream>
 
-SG_USING_STD(ifstream);
+using std::ifstream;
 
 
 
diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx
index d59d371b..f5ff575d 100644
--- a/simgear/xml/easyxml.hxx
+++ b/simgear/xml/easyxml.hxx
@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(istream);
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::istream;
+using std::string;
+using std::vector;
 
 
 /**