Replace SG_USE_STD() by using std::

2008-07-28 07:52:13 +00:00
parent aa07b5bdd8
commit d4c7e95092
61 changed files with 106 additions and 106 deletions
--- 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:
--- 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
--- 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 {
--- 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;
--- 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
--- 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 ) {
--- 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
--- 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() {
--- 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_)
--- 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;


 /**
--- 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 ) :
--- 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.
--- 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

--- 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.
--- 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() {
--- 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
 {
--- 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()
--- 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;

--- 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;
--- 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;
--- 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 {
--- 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
 {
--- 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)
--- 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
--- 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;



--- 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;

--- 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;



--- 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>

--- 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)
 {
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -37,7 +37,7 @@

 #include <string>

-SG_USING_STD(string);
+using std::string;


 /**
--- 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");
--- 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>

--- 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;
--- 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 ) {
--- 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 {
--- 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>
--- 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,
--- 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>
--- 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 {

--- 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;
--- 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>
--- 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"
--- 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;

--- 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.
--- 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 {
--- 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 {

--- 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;
--- 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 {

--- 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 {
--- 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
--- 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;
--- 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.)
--- 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;
--- 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:
--- 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>
--- 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;
--- 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;
--- 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;


 /**
--- 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;


 /**
--- 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;



--- 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;


 /**