Replace SG_USE_STD() by using std::

diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx
index 80f1892c11e86056688233153f24f110b915f956..c79f7766f805d3e3388a0e8c7dea038ae389ce95 100644 (file)
--- 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 f255e103474f9043a72df3edb1717e72040ddaba..b6439a27a039a816f4e93f20ab666ca59437ca0a 100644 (file)
--- 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 8142b3e54f295813c06605cb7723bb003edea04d..dbc251e89f1f44a8701f2415e691df15a6454f1d 100644 (file)
--- 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 b5bec16339360456f0b747e1a0b573f429c86710..42d2e3a5fa94c5e40f4dd5c27ca6c82d212f1da1 100644 (file)
--- 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 bba1a536a3b4cdd3922a8cc03eae57fcced641cb..13df0cc1c2f9e8d948cbdd300194d7a2f0da7ba5 100644 (file)
--- 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 f2af87d88d058d9969bbb8fb464bc8c8a077eb8b..302648bda8f67c5668483d5368d1918a5bcf710d 100644 (file)
--- 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 a81ca4679e4017abec52ae5677c6d796277336ca..d8a29608db20b2dbef3e6b2974bcce3881ab709a 100644 (file)
--- 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 91113cb182831d3f6d1ecad8c14b8b57fb91013b..eae27f34d42d4f12ad03ff46442f2af27621dd72 100644 (file)
--- 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 df96aa8e80d68b243a27932356d6014938bff710..213a17908a66fa5320f9d5b84a750fd441782a50 100644 (file)
--- 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 2eb87d42215f62284a6c8395bbb164251b9e1cc5..a64dd6eeba97a21772d0c01ff0293ecc8f834452 100644 (file)
--- 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 e2e068f8d8c43acab23d29c3c474f5fb3b1a94fb..b7b2f5a94cbca8c45d01928f6ec603eddbc0bcf7 100644 (file)
--- 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 d1c22ab9d3ca2547d3ef09794eb4bd18c5710e79..85a92e1c1aac1f2ea3bb4685b5ce83c3c6a7315f 100644 (file)
--- 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 40ffde380373b32929f2741e0ab6ce0bb9c58960..78c9d2d892aa6ffb460dfb5ce4831058cc7040ed 100644 (file)
--- 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 d9006fe63a807a9cd56204361fa7a12a49d03b0f..9d8e8eb696d1a5f5453e02650408eb5204e43640 100644 (file)
--- 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 ed654981d481a095564f90d210d6048e53408e07..83adfd2742cc22be9a5fbd2628d62b051c298323 100644 (file)
--- 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 89161f53487e97e708b084f7392239f5e9733754..01c949da5e33aea9e978f39438b5d3a1c2d4f6b9 100644 (file)
--- 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 6502ba5a2f6bd8caaab8613a89442c7f0ce1acde..2b6824f26b247906887d502153e83469881b5e10 100644 (file)
--- 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 06ed3832639f29bfe0c0fb886a046255d26e0150..0df566a92357d3e2d4357e475e0f38d0831c4d05 100644 (file)
--- 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 e629a55a8539938986aa44bbf394ab9298d4d505..4698acecb5886d8018ced33e24a9136e87a49617 100644 (file)
--- 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 db3b300dc8bb2206f60a16bf1bc5152e6de64bfb..70f1b6c52b5ee8ca4911813459b12fe795b95df6 100644 (file)
--- 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 59051df40cb90050954341b071fe482e1510ef1f..aa395a250a29e26bf44a9cd861b6c686dcf7a018 100644 (file)
--- 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 cc7335f7f321d0b90ee85a6c3e8bc535f0765af5..146ba36834e69985006c92731f8a273e21da1fce 100644 (file)
--- 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 53bba88dafe5ce7ffb18b754bede306cc3cd9729..64f3b60241ffb9e59b9a82e80f613926b27e85b1 100644 (file)
--- 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 afd0ceac6861b498e0a2455566fc0faece5ecf34..2705980d1c96db73cc04ed30c65878f49aface37 100644 (file)
--- 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 482197ce04d2691b1cb0de6bcb782a808c5c6716..da4f20f9af3852370661dde320e2a223ff052d9f 100644 (file)
--- 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 b706c678c52e3c7c2d5b01e45f2b3464511b74a2..cfd99debf8d08a8d26216fb5c8a46d96a5026d91 100644 (file)
--- 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 ccbf1afe951903fa2f7b9620cf07a6a95e0e4053..7e67e352ed19011a9b9a73b6950932a425d79f1a 100644 (file)
--- 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;
 
 
 \f

diff --git a/simgear/route/route.hxx b/simgear/route/route.hxx
index 6e6c5805e76ffa2b267370388aa0c29fd2f940e2..0b3701f1bef66ae2eccef6e5f66507663c283d64 100644 (file)
--- 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 3a0b585310bba69bb7cb34dc7bec70ebdae52973..4c10e7eebd1674085546b91e82c7ffdf7fa70652 100644 (file)
--- 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 6f37fa566c65e733a9e1b1fe461c2f66710b9df2..206dcb3b8f0bb2d9688bcd355ae52e0aec3fd2c1 100644 (file)
--- 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 f3c428c9271cc244b07da5f40911e53d56455648..f0debfd93a1a12259a3d126c3720750f9316ea66 100644 (file)
--- 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 8edb5206f472964371db1379ba25e35a2d61cdea..cd0bcee01f840410159b458ce089c0cb5e4a0cf7 100644 (file)
--- 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 621f7940243c8d67c60bd2cefa105b689d3b5c21..332197a1e378cd557a5a3b7e845ec27c0cbc6fcd 100644 (file)
--- 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 de8e6241c7fd780da74c550fa740074037db7d13..6aa82d4ef39df443bda6418feb1a646527be4cc6 100644 (file)
--- 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 9c96523b2460d03abcd2d518f3b1775edddd0c33..94f478817797d578fbe5c9fc1925a6d2e690fab4 100644 (file)
--- 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 1b3204da5dd94c976b3c01c1559a1f729e399c49..47fe1e0942567aa8ca72215f8a138c8164bc9a33 100644 (file)
--- 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 cdd50861c478979587126563c501018b54eb4856..aece3e2d77224070fbfb0d9d09ce4356d539c28b 100644 (file)
--- 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 1de3bf40c0e77d99b845bf5cf923e688762e669d..9f930f3eb8d2b83010c50c4093db58a079b66112 100644 (file)
--- 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 806b7f23b51328ccf84702fe1ad9f89d63687543..f40ba92ef24b8a29ae0adf6dc0838df083097128 100644 (file)
--- 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 8f5ebcde51d8589a128994b6d3c5aaec187315d0..1f4f3f5677c4c6e7dab7f45c838a9fd1f5052c0a 100644 (file)
--- 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 663ade3bd312f13af50088a10cea6cee021b4bfc..fd0722c6fac4c98749c4fa462f88ff03d61baa30 100644 (file)
--- 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 2c048a97864343e4a6ca95f8bc250b36b1c1d75e..d0097dcbe3e49560276d11d92f96d8e11ca3f753 100644 (file)
--- 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 5016c6329f3bba01622d770249757aa84cae695b..fc358688c3d49715ed714f4c71e5041660d5c2ca 100644 (file)
--- 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 adda37eeef64a3065a88f077bb6d82f5162f4bc3..b3a2846f2739f60780aa5c886006ded922ddb1b1 100644 (file)
--- 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 d842b9b7b7a3f3301832c2aeb3262290241272b9..46c302845dfeb260199bd9fbb762c17ffec77312 100644 (file)
--- 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 6e137d0ad66f67a3aeb0e9b5a240ab1a86016d28..f3c8a582b729c0be33f4117a1bbb69502a5a665c 100644 (file)
--- 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 79a1bf41a4fa8f363091b335d65692f08a826608..64f9c3e0cb6021ecbc06b994d4d9b910f3b0b783 100644 (file)
--- 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 cf0ffccc677fd2ca15febaa0e227ae9e34ed42d8..eee74541292c39c831a823202a4a70025a29d3a5 100644 (file)
--- 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 296a8d3e01d75874ada78157925a918133a8d224..4053dda16ff204b0a513d4af480ba9d48a1bd3dc 100644 (file)
--- 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 62282b410155ecb49909e55839fd666443c15df5..8e3718a4d04be23613b25596732e016bf7b7da5e 100644 (file)
--- 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 d9b2075dee4b2b8f42c390a1104f9fe62cdea90b..126ed6ccab3645d05fe7afe7f38accb8f4039cef 100644 (file)
--- 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 9e95674ed199b6f19856648ee47288a5902f9a80..5f831cbf47d4248cc42c24f1b64c7c5d36f45e2a 100644 (file)
--- 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 5acf06a32eb893fd1e18d7d700569ff5776eb5a3..da0a4f5da47e3595e16dc29cdecc00848e51c33c 100644 (file)
--- 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 df76790115385516ea2869d920828f877c666991..2bd3e8eb1178061416b665eac44b8919d460834d 100644 (file)
--- 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 d2c1f838cd8053f18e5151f83e09bb90d46370c0..83cc60085fc7150a69aedc851fb346aecb4974af 100644 (file)
--- 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 d82d993c039f36877a79c1fabf33e510f932f07f..828be05371e981013226c76ede7a4e95f37cb173 100644 (file)
--- 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 d306f82e7d43fcefb16bdf638896f136e47a7c05..477386e53b249115bcb2223e0254677f802690cf 100644 (file)
--- 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 147c4f3de0f9bb383fc14ee3334e6e2981238123..21f44963500dff42f180f2391dffe4de0aee7030 100644 (file)
--- 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 e482be310ebe2faf45a37931b4a591525a695742..d3b37834e9e8d360e3a567fb186482d93d18b551 100644 (file)
--- 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 0779d872b38e9120a52cdb13db5e5dd1887f5590..65a35513201a2de40a24b11b9b7cb01a63d28593 100644 (file)
--- 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;
 
 
 \f

diff --git a/simgear/xml/easyxml.hxx b/simgear/xml/easyxml.hxx
index d59d371b0022e413937d1ce77f23f9fb4170a0d6..f5ff575d9dcb2d803f277c3e32bfe6af335e32a6 100644 (file)
--- 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;
 
 
 /**