- remove the SG_GLxxxx_H #defines, since OSG provides its own versions

 - this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
   extensions.hxx was pulling in all of Carbon to the global namespace
   - very scary. As a result, I now need to explicitly include CoreFoundation
   in fg_init.cxx.
 - change SG_USING_STD(x) to using std::x

diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx
index 7a06ba24189a3024ea4b65653b268f3688b5f2cb..7d6d0d2c58a6f14f8398f4cd54c8c11457651601 100644 (file)
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@@ -40,7 +40,7 @@
 #  include <ieeefp.h>
 #endif
 
-SG_USING_STD(string);
+using std::string;
 
 #include "AIAircraft.hxx"
 #include "performancedata.hxx"

diff --git a/src/AIModel/AIAircraft.hxx b/src/AIModel/AIAircraft.hxx
index f4adf16ba7d18e23608589d4333cb85455b89d52..d609ef92aa74cff62a7b780b27692579f385acc5 100644 (file)
--- a/src/AIModel/AIAircraft.hxx
+++ b/src/AIModel/AIAircraft.hxx
@@ -28,7 +28,7 @@
 #include <Traffic/Schedule.hxx>
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 class PerformanceData;
 

diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx
index b6fb58a0fd263a4849cef36db1972fef57740098..2d184b015537dae2237699c96a2a04486c63779a 100644 (file)
--- a/src/AIModel/AIBallistic.hxx
+++ b/src/AIModel/AIBallistic.hxx
@@ -31,8 +31,8 @@
 #include "AIManager.hxx"
 #include "AIBase.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(list);
+using std::vector;
+using std::list;
 
 class FGAIBallistic : public FGAIBase {
 

diff --git a/src/AIModel/AIBase.hxx b/src/AIModel/AIBase.hxx
index ec55ce998d56d6c384a2424b7a5836484e2aab81..7f02842360de92ee8a58717d3a4aadcbb3e2d85e 100644 (file)
--- a/src/AIModel/AIBase.hxx
+++ b/src/AIModel/AIBase.hxx
@@ -34,8 +34,8 @@
 #include <Main/fg_props.hxx>
 
 
-SG_USING_STD(string);
-SG_USING_STD(list);
+using std::string;
+using std::list;
 
 class FGAIManager;
 class FGAIFlightPlan;

diff --git a/src/AIModel/AICarrier.hxx b/src/AIModel/AICarrier.hxx
index 0e88ba4527b8161549abf68f4e7fe226bb6a0271..c359c3fcb35f4b5aba7dd373507650f45a9f6ef3 100644 (file)
--- a/src/AIModel/AICarrier.hxx
+++ b/src/AIModel/AICarrier.hxx
@@ -29,8 +29,8 @@
 
 #include <simgear/compiler.h>
 
-SG_USING_STD(string);
-SG_USING_STD(list);
+using std::string;
+using std::list;
 
 #include "AIShip.hxx"
 

diff --git a/src/AIModel/AIFlightPlan.hxx b/src/AIModel/AIFlightPlan.hxx
index f4b07859031aae46e253e24c45b109b89b82b9fe..1525c662183e68d67344c03f4b8eedf7ef777979 100644 (file)
--- a/src/AIModel/AIFlightPlan.hxx
+++ b/src/AIModel/AIFlightPlan.hxx
@@ -29,8 +29,8 @@
 
 #include "AIBase.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 
 class FGAIFlightPlan {

diff --git a/src/AIModel/AIFlightPlanCreateCruise.cxx b/src/AIModel/AIFlightPlanCreateCruise.cxx
index 7b6e68101ff9693529f21d844871e0162abc631e..28f0b8de677dc162a666f3eb4eb4e42c0a4a5c3e 100755 (executable)
--- a/src/AIModel/AIFlightPlanCreateCruise.cxx
+++ b/src/AIModel/AIFlightPlanCreateCruise.cxx
@@ -31,7 +31,7 @@
 #include <Environment/environment_mgr.hxx>
 #include <Environment/environment.hxx>
 
-SG_USING_STD(iostream);
+using std::iostream;
 
 void FGAIFlightPlan::evaluateRoutePart(double deplat,
                                       double deplon,

diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx
index 19303fc34a21070458288f0b70ca46caac16bdf5..8b3582b39f25d6bc9f4c4990c698fe38d2689394 100644 (file)
--- a/src/AIModel/AIManager.hxx
+++ b/src/AIModel/AIManager.hxx
@@ -36,7 +36,7 @@
 #include <Traffic/SchedFlight.hxx>
 #include <Traffic/Schedule.hxx>
 
-SG_USING_STD(list);
+using std::list;
 
 class FGAIThermal;
 

diff --git a/src/AIModel/AIStatic.cxx b/src/AIModel/AIStatic.cxx
index a480e2eeedf5517468b57ebf267b3b0efc502b4d..140325d42a424e3a9eb1effab604c1edd88d69b4 100644 (file)
--- a/src/AIModel/AIStatic.cxx
+++ b/src/AIModel/AIStatic.cxx
@@ -29,7 +29,7 @@
 #include <string>
 #include <math.h>
 
-SG_USING_STD(string);
+using std::string;
 
 #include "AIStatic.hxx"
 

diff --git a/src/AIModel/AIStatic.hxx b/src/AIModel/AIStatic.hxx
index 384ff1b182fb7afba3450f5085d8970230586374..f7ca53a393b80cfd69bdbc9640baac8aca1bde91 100644 (file)
--- a/src/AIModel/AIStatic.hxx
+++ b/src/AIModel/AIStatic.hxx
@@ -25,7 +25,7 @@
 #include "AIBase.hxx"
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 
 class FGAIStatic : public FGAIBase {

diff --git a/src/AIModel/AIStorm.cxx b/src/AIModel/AIStorm.cxx
index 2a99b2c312000b6c29637df1c5dd8376746e8be4..3220cc773a6e094b356f94f79c1c83a93c4d4cf4 100644 (file)
--- a/src/AIModel/AIStorm.cxx
+++ b/src/AIModel/AIStorm.cxx
@@ -31,7 +31,7 @@
 #include <cstdlib>
 #include <time.h>
 
-SG_USING_STD(string);
+using std::string;
 
 #include "AIStorm.hxx"
 

diff --git a/src/AIModel/AIStorm.hxx b/src/AIModel/AIStorm.hxx
index 3a0153fc5b25654c2c6dc56d7507d7a929d99159..f6a7e9018da12337d48ba94b5d90eef3691cac9e 100644 (file)
--- a/src/AIModel/AIStorm.hxx
+++ b/src/AIModel/AIStorm.hxx
@@ -25,7 +25,7 @@
 #include "AIBase.hxx"
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 
 class FGAIStorm : public FGAIBase {

diff --git a/src/AIModel/AIThermal.cxx b/src/AIModel/AIThermal.cxx
index d01421c734c9c2fea76b67baf09239f0ee3ec7d6..0f1ee18f569ea0e35dcfea7c9725cf679c6e58b4 100644 (file)
--- a/src/AIModel/AIThermal.cxx
+++ b/src/AIModel/AIThermal.cxx
@@ -29,7 +29,7 @@
 #include <string>
 #include <math.h>
 
-SG_USING_STD(string);
+using std::string;
 
 #include "AIThermal.hxx"
 

diff --git a/src/AIModel/AIThermal.hxx b/src/AIModel/AIThermal.hxx
index 38a50bea9da7784a107eefd3e74f623bb47bdc98..731ac81ce61c168c03d03eaeffbe56d23d8db59c 100644 (file)
--- a/src/AIModel/AIThermal.hxx
+++ b/src/AIModel/AIThermal.hxx
@@ -25,7 +25,7 @@
 #include "AIBase.hxx"
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 
 class FGAIThermal : public FGAIBase {

diff --git a/src/AIModel/submodel.hxx b/src/AIModel/submodel.hxx
index 3f6965fcc917f6ec1823bff1c760abed543a681e..d054033cd6555e7430836df3d0a81660fe063895 100644 (file)
--- a/src/AIModel/submodel.hxx
+++ b/src/AIModel/submodel.hxx
@@ -19,9 +19,9 @@
 
 #include <Main/fg_props.hxx>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
-SG_USING_STD(list);
+using std::vector;
+using std::string;
+using std::list;
 
 class FGAIBase;
 

diff --git a/src/ATC/trafficcontrol.hxx b/src/ATC/trafficcontrol.hxx
index b4f6e1517552e4c01c8982ba6ffbc3637752c934..66c4803e76fe36b3b76217d745eefba7aa7ceb7d 100644 (file)
--- a/src/ATC/trafficcontrol.hxx
+++ b/src/ATC/trafficcontrol.hxx
@@ -35,8 +35,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 
 typedef vector<int> intVec;

diff --git a/src/ATCDCL/AIGAVFRTraffic.cxx b/src/ATCDCL/AIGAVFRTraffic.cxx
index 6941a2489260d00055f7179c5a3ed09ff7e57d76..811002f23b1b4bbf9cc0ebe3e57d7ed16bc2644e 100644 (file)
--- a/src/ATCDCL/AIGAVFRTraffic.cxx
+++ b/src/ATCDCL/AIGAVFRTraffic.cxx
@@ -29,7 +29,7 @@
 #include <string>
 #include <math.h>
 
-SG_USING_STD(string);
+using std::string;
 
 #include "ATC.hxx"
 #include "ATCmgr.hxx"

diff --git a/src/ATCDCL/AIGAVFRTraffic.hxx b/src/ATCDCL/AIGAVFRTraffic.hxx
index 9aabd87466cd7a6245d8b66935d867262d20ed2e..771aa8f9d27844d34d40169c319dfbd83f6967ec 100644 (file)
--- a/src/ATCDCL/AIGAVFRTraffic.hxx
+++ b/src/ATCDCL/AIGAVFRTraffic.hxx
@@ -28,7 +28,7 @@
 #include "AILocalTraffic.hxx"
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 class FGAIGAVFRTraffic : public FGAILocalTraffic {
        

diff --git a/src/ATCDCL/AILocalTraffic.cxx b/src/ATCDCL/AILocalTraffic.cxx
index 15eb6a3d3c1c7ccfc25d0041ab44e96eb5fabb66..2afd62ea9f064bebc05e253ecc06ecb9b75f7f94 100644 (file)
--- a/src/ATCDCL/AILocalTraffic.cxx
+++ b/src/ATCDCL/AILocalTraffic.cxx
@@ -47,7 +47,7 @@ during descent to avoid occasionally landing short or long.
 #include <string>
 #include <math.h>
 
-SG_USING_STD(string);
+using std::string;
 
 #include "ATCmgr.hxx"
 #include "AILocalTraffic.hxx"

diff --git a/src/ATCDCL/AILocalTraffic.hxx b/src/ATCDCL/AILocalTraffic.hxx
index a4e1505f64495ae15d9de65c99d44b2f44c245a9..e2fb7ee6c5d77878f51ef866bb3137f1e2e2ed12 100644 (file)
--- a/src/ATCDCL/AILocalTraffic.hxx
+++ b/src/ATCDCL/AILocalTraffic.hxx
@@ -34,7 +34,7 @@ class FGTower;
 struct Gate;
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 enum TaxiState {
        TD_INBOUND,

diff --git a/src/ATCDCL/AIMgr.cxx b/src/ATCDCL/AIMgr.cxx
index 23d44bbf1b4ac5365a1ca4319649d643d8b36f0d..c8f7b8b028fb8f67bc953774755b480ea9acc802 100644 (file)
--- a/src/ATCDCL/AIMgr.cxx
+++ b/src/ATCDCL/AIMgr.cxx
@@ -46,8 +46,8 @@
 #include "ATCutils.hxx"
 #include "commlist.hxx"
 
-SG_USING_STD(list);
-SG_USING_STD(cout);
+using std::list;
+using std::cout;
 
 using namespace simgear;
 

diff --git a/src/ATCDCL/AIMgr.hxx b/src/ATCDCL/AIMgr.hxx
index 6bc81a10b9afd33da00cf5366e2415469d24d2d9..d08d6f56662794c2f5516efd05fdfea8f6fcd96d 100644 (file)
--- a/src/ATCDCL/AIMgr.hxx
+++ b/src/ATCDCL/AIMgr.hxx
@@ -31,7 +31,7 @@
 #include "ATCmgr.hxx"
 #include "AIEntity.hxx"
 
-SG_USING_STD(list);
+using std::list;
 
 
 class FGAIMgr : public SGSubsystem

diff --git a/src/ATCDCL/AIPlane.cxx b/src/ATCDCL/AIPlane.cxx
index 84006294d984304c968cbdaf0c4fe77d3d908754..5352c1c47d00324497dcbb71dc5290fd515f984d 100644 (file)
--- a/src/ATCDCL/AIPlane.cxx
+++ b/src/ATCDCL/AIPlane.cxx
@@ -25,7 +25,7 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <math.h>
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 
 #include "AIPlane.hxx"

diff --git a/src/ATCDCL/ATC.hxx b/src/ATCDCL/ATC.hxx
index 1f73b5bef20b88860098aaa12b160a99489bbd79..ecc9f5f603f4d9a4c8b4fd5d9454f087b81cf2a8 100644 (file)
--- a/src/ATCDCL/ATC.hxx
+++ b/src/ATCDCL/ATC.hxx
@@ -35,9 +35,9 @@
 
 #include "ATCVoice.hxx"
 
-SG_USING_STD(ostream);
-SG_USING_STD(string);
-SG_USING_STD(ios);
+using std::ostream;
+using std::string;
+using std::ios;
 
 enum plane_type {
        UNKNOWN,

diff --git a/src/ATCDCL/ATCDialog.cxx b/src/ATCDCL/ATCDialog.cxx
index 2946478da79633c790f46e5801005ff4526be488..80d7edce0ca0dd371a5f41079282deb06069be05 100644 (file)
--- a/src/ATCDCL/ATCDialog.cxx
+++ b/src/ATCDCL/ATCDialog.cxx
@@ -39,7 +39,7 @@
 
 #include <sstream>
 
-SG_USING_STD(ostringstream);
+using std::ostringstream;
 
 FGATCDialog *current_atcdialog;
 

diff --git a/src/ATCDCL/ATCDialog.hxx b/src/ATCDCL/ATCDialog.hxx
index 76cf2cc9fb3e9892152b7646dad9f02aefddd400..ea393c907546223645a089e7cf5d1a2705e2657d 100644 (file)
--- a/src/ATCDCL/ATCDialog.hxx
+++ b/src/ATCDCL/ATCDialog.hxx
@@ -28,8 +28,8 @@
 
 #include "ATC.hxx"
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
+using std::vector;
+using std::map;
 
 class NewGUI;
 

diff --git a/src/ATCDCL/ATCVoice.hxx b/src/ATCDCL/ATCVoice.hxx
index 3185cc0234d0c30ac2c2a09fd2bef627af695fac..bdd2b0a491002a6dd5b46893f57818cc2ef3a42f 100644 (file)
--- a/src/ATCDCL/ATCVoice.hxx
+++ b/src/ATCDCL/ATCVoice.hxx
@@ -30,9 +30,9 @@
 
 #include <simgear/sound/sample_openal.hxx>
 
-SG_USING_STD(map);
-SG_USING_STD(list);
-SG_USING_STD(string);
+using std::map;
+using std::list;
+using std::string;
 
 
 struct WordData {

diff --git a/src/ATCDCL/ATCmgr.hxx b/src/ATCDCL/ATCmgr.hxx
index 9e8e1f83747b3c9388a4a3596dee365598e77afe..9ac6a75d97558d30ef88c173f3759162d4cccf05 100644 (file)
--- a/src/ATCDCL/ATCmgr.hxx
+++ b/src/ATCDCL/ATCmgr.hxx
@@ -34,9 +34,9 @@
 #include "tower.hxx"
 #include "approach.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(list);
-SG_USING_STD(map);
+using std::string;
+using std::list;
+using std::map;
 
 // Structure for holding details of the ATC frequencies at a given airport, and whether they are in the active list or not.
 // These can then be cross referenced with the commlists which are stored by frequency or bucket.

diff --git a/src/ATCDCL/ATCutils.hxx b/src/ATCDCL/ATCutils.hxx
index 80b155e0831d589e47f4fa88612ce882c826a7b7..b5248b84a3342e48d6abebd0066ed1c86c80d377 100644 (file)
--- a/src/ATCDCL/ATCutils.hxx
+++ b/src/ATCDCL/ATCutils.hxx
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <simgear/math/point3d.hxx>
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 // These are defined here because I had a problem with SG_DEGREES_TO_RADIANS
 #define DCL_PI  3.1415926535f

diff --git a/src/ATCDCL/atis.cxx b/src/ATCDCL/atis.cxx
index d7209a14122d29baa47b3e2090adf4edbab11e53..30a7f5af723ce790e45fc1fbf59a2929e5424e51 100644 (file)
--- a/src/ATCDCL/atis.cxx
+++ b/src/ATCDCL/atis.cxx
@@ -29,10 +29,10 @@
 #include <stdlib.h>    // atoi()
 #include <stdio.h>     // sprintf
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 #include <iostream>
-SG_USING_STD(cout);
+using std::cout;
 
 #include <simgear/misc/sg_path.hxx>
 

diff --git a/src/ATCDCL/commlist.hxx b/src/ATCDCL/commlist.hxx
index 1cb2f4855c72b6457d95c5f9014c287f587897f6..e253e6e98c60feea16ff59c32e72a8440de89eb2 100644 (file)
--- a/src/ATCDCL/commlist.hxx
+++ b/src/ATCDCL/commlist.hxx
@@ -44,10 +44,10 @@
 #include "ATC.hxx"
 #include "atis.hxx"
 
-SG_USING_STD(list);
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::list;
+using std::map;
+using std::vector;
+using std::string;
 
 // A list of ATC stations
 typedef list < ATCData > comm_list_type;

diff --git a/src/ATCDCL/ground.cxx b/src/ATCDCL/ground.cxx
index 5176f13924d2b5b319525191516c3fc262131e12..e1909885c5da6000e0eb57862b1e5ffa4a0fc385 100644 (file)
--- a/src/ATCDCL/ground.cxx
+++ b/src/ATCDCL/ground.cxx
@@ -37,8 +37,8 @@
 #include "AILocalTraffic.hxx"
 #include "ATCmgr.hxx"
 
-SG_USING_STD(ifstream);
-SG_USING_STD(cout);
+using std::ifstream;
+using std::cout;
 
 node::node() {
 }

diff --git a/src/ATCDCL/tower.cxx b/src/ATCDCL/tower.cxx
index fccaaaba16bfd0386b55b9fa3e6c0434d33b1732..e61109bfb10ef6072bf28112b6013ff94f0861f3 100644 (file)
--- a/src/ATCDCL/tower.cxx
+++ b/src/ATCDCL/tower.cxx
@@ -48,7 +48,7 @@
 #include "AILocalTraffic.hxx"
 
 
-SG_USING_STD(cout);
+using std::cout;
 
 // TowerPlaneRec
 

diff --git a/src/ATCDCL/transmissionlist.hxx b/src/ATCDCL/transmissionlist.hxx
index ae6be8a8b660b550eff72913992bbe13ed5cc7d5..ac1c76025bad577beb63285c051bb2b69e3fefcd 100644 (file)
--- a/src/ATCDCL/transmissionlist.hxx
+++ b/src/ATCDCL/transmissionlist.hxx
@@ -34,8 +34,8 @@
 #include "ATC.hxx"
 #include "transmission.hxx"
 
-SG_USING_STD(map);
-SG_USING_STD(vector);
+using std::map;
+using std::vector;
 
 class FGTransmissionList {
 

diff --git a/src/Aircraft/replay.hxx b/src/Aircraft/replay.hxx
index 1891d42214cdd3f107a8a2c275fd8006ffb0e685..0e599c1a42f4f3b7721b15244e1a7f0acaa20f76 100644 (file)
--- a/src/Aircraft/replay.hxx
+++ b/src/Aircraft/replay.hxx
@@ -39,7 +39,7 @@
 #include <Network/net_ctrls.hxx>
 #include <Network/net_fdm.hxx>
 
-SG_USING_STD(deque);
+using std::deque;
 
 
 class FGReplayData {

diff --git a/src/Airports/apt_loader.hxx b/src/Airports/apt_loader.hxx
index e96bde6a4958b0d7a8d78999b0488607ad8ea091..ea13216a5afc730c4124d81b1e76338bfa81709e 100644 (file)
--- a/src/Airports/apt_loader.hxx
+++ b/src/Airports/apt_loader.hxx
@@ -34,7 +34,7 @@
 
 #include <string>
 
-SG_USING_STD(string);
+using std::string;
 
 #include "simple.hxx"
 #include "runways.hxx"

diff --git a/src/Airports/calc_loc.cxx b/src/Airports/calc_loc.cxx
index 4974f0af2d35a12f3f5b1cdea6295c8334456159..3ca71bef36b114948f5634f18b8337fed6dc4fb7 100644 (file)
--- a/src/Airports/calc_loc.cxx
+++ b/src/Airports/calc_loc.cxx
@@ -17,9 +17,9 @@
 #include <simgear/math/sg_geodesy.hxx>
 
 
-SG_USING_STD(string);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::string;
+using std::cout;
+using std::endl;
 
 int main( int argc, char **argv ) {
 

diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index 868c45cea171ed7e596bdc622f5f5def44dd7fbe..39c305cca9f24f3f911757d02a82176d564ef15a 100644 (file)
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -43,10 +43,10 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
-SG_USING_STD(sort);
-SG_USING_STD(random_shuffle);
+using std::string;
+using std::vector;
+using std::sort;
+using std::random_shuffle;
 
 #include "simple.hxx"
 #include "dynamics.hxx"

diff --git a/src/Airports/gnnode.cxx b/src/Airports/gnnode.cxx
index d82ae28fbb21865231946c8d2dec70378e838210..b7b21b04012c986dc46c87956f587c051b377f20 100644 (file)
--- a/src/Airports/gnnode.cxx
+++ b/src/Airports/gnnode.cxx
@@ -2,7 +2,7 @@
 #include "groundnetwork.hxx"
 
 #include <algorithm>
-SG_USING_STD(sort);
+using std::sort;
 
 /*****************************************************************************
  * Helper function for parsing position string

diff --git a/src/Airports/gnnode.hxx b/src/Airports/gnnode.hxx
index 9912600e68df184f6f832a795c4a9ed7ce8e87cc..aee5d6a81cbce3b3a4857fc3d8d5fcac9d1de5a9 100644 (file)
--- a/src/Airports/gnnode.hxx
+++ b/src/Airports/gnnode.hxx
@@ -20,8 +20,8 @@
 #include <string>
 #include <simgear/compiler.h>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 class FGTaxiSegment;
 typedef vector<FGTaxiSegment*>  FGTaxiSegmentVector;

diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx
index ae9aa4d207a79aa3de3065cc359b1b167e427f66..a70fa2c099c2b78384517af64a07e4a603902a06 100644 (file)
--- a/src/Airports/groundnetwork.hxx
+++ b/src/Airports/groundnetwork.hxx
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include "gnnode.hxx"
 #include "parking.hxx"

diff --git a/src/Airports/parking.hxx b/src/Airports/parking.hxx
index 5ff130b82124ff19ee7871ead09d435eb9367195..0cac08bbcdc9069bc2b0f97c50a3776a3e9a1e7c 100644 (file)
--- a/src/Airports/parking.hxx
+++ b/src/Airports/parking.hxx
@@ -36,8 +36,8 @@
 
 #include "gnnode.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 class FGTaxiRoute;
 

diff --git a/src/Airports/runwayprefloader.hxx b/src/Airports/runwayprefloader.hxx
index 56a62eed3f049de5d77031779f088c8e17061ea2..f86fd327ee55d9b114bd0d028e138e2b2ae87e9a 100644 (file)
--- a/src/Airports/runwayprefloader.hxx
+++ b/src/Airports/runwayprefloader.hxx
@@ -24,7 +24,7 @@
 
 #include "runwayprefs.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 class FGRunwayPreferenceXMLLoader : public XMLVisitor {
 public:

diff --git a/src/Airports/runwayprefs.hxx b/src/Airports/runwayprefs.hxx
index 9b0c7485f3a8a3f37e438e7766a4b8be407115b4..d3fccdcc224add5f2892fc0baedffc6b2684d13d 100644 (file)
--- a/src/Airports/runwayprefs.hxx
+++ b/src/Airports/runwayprefs.hxx
@@ -30,8 +30,8 @@
 
 #include <simgear/compiler.h>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 typedef vector<time_t> timeVec;
 typedef vector<time_t>::const_iterator timeVecConstIterator;

diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index 726b46433ddb7ff8a1a6f3666587d115e1b04f4b..3ea0b64cf5c43a2f50d37ae900fd01ae5b9f5d7a 100644 (file)
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@@ -38,8 +38,8 @@
 
 #include "runways.hxx"
 
-SG_USING_STD(istream);
-SG_USING_STD(multimap);
+using std::istream;
+using std::multimap;
 
 
 // add an entry to the list

diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx
index 6dcf4e76d9370a9d04178551fdaf49102d54103d..532c777cff8b2483cd8cd0c8156c9256dab32efe 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -39,8 +39,8 @@
 #include <string>
 #include <map>
 
-SG_USING_STD(string);
-SG_USING_STD(multimap);
+using std::string;
+using std::multimap;
 
 
 struct ltstr {

diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx
index 5c9330bd59142762e635a6daaff86973a5201d50..018b44cea9886f75b2de158248c9f80d5c8b06a4 100644 (file)
--- a/src/Airports/simple.cxx
+++ b/src/Airports/simple.cxx
@@ -52,8 +52,8 @@
 #include "simple.hxx"
 #include "xmlloader.hxx"
 
-SG_USING_STD(sort);
-SG_USING_STD(random_shuffle);
+using std::sort;
+using std::random_shuffle;
 
 
 

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index 0b562424c0dcc9acfc7453487b32b032c2090437..78a53e750794bb1febfe90a76324550f4239141d 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -51,10 +51,10 @@
 #include "dynamics.hxx"
 
 
-SG_USING_STD(string);
-SG_USING_STD(map);
-SG_USING_STD(set);
-SG_USING_STD(vector);
+using std::string;
+using std::map;
+using std::set;
+using std::vector;
 
 
 

diff --git a/src/Autopilot/route_mgr.hxx b/src/Autopilot/route_mgr.hxx
index 4b25c4e09556d0847073accd00cf198607b344da..67a27d7c8b9636c811b3f593fde6c08152f1ef58 100644 (file)
--- a/src/Autopilot/route_mgr.hxx
+++ b/src/Autopilot/route_mgr.hxx
@@ -37,8 +37,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include <simgear/props/props.hxx>
 #include <simgear/route/route.hxx>

diff --git a/src/Autopilot/xmlauto.hxx b/src/Autopilot/xmlauto.hxx
index ad206b5a27ef05aaea1d0dc70da0470e244954a4..07d5dd7ced1fa62562122b191f642b467ae1b4b3 100644 (file)
--- a/src/Autopilot/xmlauto.hxx
+++ b/src/Autopilot/xmlauto.hxx
@@ -38,9 +38,9 @@
 #include <vector>
 #include <deque>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
-SG_USING_STD(deque);
+using std::string;
+using std::vector;
+using std::deque;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>

diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index 1cd14b960dcf801e6b5c50248a4342af4abc8728..617909b2ae95f611469a3cc9a7440502545e5893 100644 (file)
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -38,6 +38,7 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <osg/GLU>
 
 #include <Aircraft/aircraft.hxx>
 //#include <Autopilot/xmlauto.hxx>
@@ -47,8 +48,6 @@
 
 #include "hud.hxx"
 
-#include SG_GLU_H
-
 
 static HUD_Properties *HUDprop = 0;
 

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index 9782e7f5986f5f51cef67d954a547f22dc46bcec..8c7d1632813282697f8639bbfa8f49e939ce7b25 100644 (file)
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -65,8 +65,8 @@ namespace osg {
 
 #include <plib/sg.h>
 
-SG_USING_STD(deque);
-SG_USING_STD(vector);
+using std::deque;
+using std::vector;
 
 #define float_to_int(v) SGMiscf::roundToInt(v)
 

diff --git a/src/Cockpit/hud_rwy.cxx b/src/Cockpit/hud_rwy.cxx
index ed17943123cc781bc35a3c9a7df77f75a3105981..f70ed6d779109c704464c6e0010d8ca3a0d19630 100644 (file)
--- a/src/Cockpit/hud_rwy.cxx
+++ b/src/Cockpit/hud_rwy.cxx
@@ -34,7 +34,7 @@
 #include <simgear/math/polar3d.hxx>
 #include <ATCDCL/ATCutils.hxx>
 
-#include SG_GLU_H
+#include <osg/GLU>
 
 
 // int x, int y, int width, int height, float scale_data, bool working)

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index c63fd652752ba67bd26f8bcdb5aa2b3593193a0b..a940df8c3d93be91ab020edc9fc0ca8dc01571d3 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -47,6 +47,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/model/model.hxx>
+#include <osg/GLU>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -57,8 +58,6 @@
 #include "hud.hxx"
 #include "panel.hxx"
 
-#include SG_GLU_H
-
 #define WIN_X 0
 #define WIN_Y 0
 #define WIN_W 1024

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 0b9f71906ce8afd79bbbfe3ddd2eab85572cf4ae..58c1eed4a0e5190208af5a3ee2cb2386c839205a 100644 (file)
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -50,8 +50,8 @@
 #include <Input/input.hxx>
 #include <Instrumentation/dclgps.hxx>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
+using std::vector;
+using std::map;
 
 
 class FGPanelInstrument;

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index 418267f2398a4e72af4604d50d2d4ab944ab879e..dd1f1036155c0df275f02c9f1e1ed391a0ebe5e4 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -46,9 +46,9 @@
 //built-in layers
 #include "built_in/FGMagRibbon.hxx"
 
-SG_USING_STD(istream);
-SG_USING_STD(ifstream);
-SG_USING_STD(string);
+using std::istream;
+using std::ifstream;
+using std::string;
 
 
 \f

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index 66bb8e484da30a6f9103ce02b3d79a6ea21a94a3..79f4a870b9640389f9780c5282ab29d9b34c558e 100644 (file)
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -39,7 +39,7 @@
 #include "environment_mgr.hxx"
 #include "environment_ctrl.hxx"
 
-SG_USING_STD(sort);
+using std::sort;
 
 class metar_filter : public FGAirportSearchFilter {
     virtual bool pass(FGAirport *a) { return a->getMetar(); }

diff --git a/src/Environment/environment_ctrl.hxx b/src/Environment/environment_ctrl.hxx
index fb042a1523df0cec7a4021debe3219fa3610da7d..d06a7d108265eef8a1bb1ec503727f20f754687f 100644 (file)
--- a/src/Environment/environment_ctrl.hxx
+++ b/src/Environment/environment_ctrl.hxx
@@ -40,8 +40,8 @@
 #include <queue>
 #include <vector>
 
-SG_USING_STD(queue);
-SG_USING_STD(vector);
+using std::queue;
+using std::vector;
 
 class SGPropertyNode;
 class FGAirport;

diff --git a/src/Environment/fgclouds.hxx b/src/Environment/fgclouds.hxx
index 8a14f7f6ff023556c2b09063cb7db69aa695e651..71fc0ecbcd05ab93e314a326f47fc0fddf61055b 100644 (file)
--- a/src/Environment/fgclouds.hxx
+++ b/src/Environment/fgclouds.hxx
@@ -32,7 +32,7 @@
 
 #include <string>
 
-SG_USING_STD(string);
+using std::string;
 
 class SGNewCloud;
 class SGCloudField;

diff --git a/src/Environment/fgmetar.hxx b/src/Environment/fgmetar.hxx
index 7d69684f5ff55b920cbd30fdfb2c8b9864e5550b..8a9884cc80d03501557f35f8ae1a5d647bea51a0 100644 (file)
--- a/src/Environment/fgmetar.hxx
+++ b/src/Environment/fgmetar.hxx
@@ -30,9 +30,9 @@
 
 #include <simgear/environment/metar.hxx>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::vector;
+using std::map;
+using std::string;
 
 
 class FGMetar : public SGMetar {

diff --git a/src/FDM/LaRCsim/LaRCsimIC.cxx b/src/FDM/LaRCsim/LaRCsimIC.cxx
index 47a2b47063a71330c3bee00517bb8d9bc06964d2..ddf196d2ce0876e2dd7f03ed29af490ffb57c1e5 100644 (file)
--- a/src/FDM/LaRCsim/LaRCsimIC.cxx
+++ b/src/FDM/LaRCsim/LaRCsimIC.cxx
@@ -39,8 +39,8 @@
 
 #include "LaRCsimIC.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 
 LaRCsimIC::LaRCsimIC(void) {

diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
index ba936320f10bdbb73dfa1bbec162b7b53d820f8e..7021554e7165405909e134d150a4c3364b9a0a98 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
@@ -10,7 +10,7 @@
 #include "uiuc_aircraft.h"
 #include "uiuc_warnings_errors.h"
 
-//SG_USING_STD(istrstream);
+//using std::istrstream;
 
 int uiuc_1DdataFileReader( string file_name, 
                             double x[], 

diff --git a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
index ba44df811064ae3116d3020c9808e958ecffa36e..428abc10de7dfed1896f705762961d8081b4cf60 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
@@ -9,7 +9,7 @@
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 
-//SG_USING_STD(istrstream);
+//using std::istrstream;
 
 void uiuc_2DdataFileReader( string file_name, 
                             double x[100][100], 

diff --git a/src/FDM/UIUCModel/uiuc_flapdata.h b/src/FDM/UIUCModel/uiuc_flapdata.h
index 55d73d00917ff55bee232b44d356289a1e6c65e6..28b1c7b9f68903fad0863cb91154f4ddae105288 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_flapdata.h
+++ b/src/FDM/UIUCModel/uiuc_flapdata.h
@@ -16,8 +16,8 @@ robinst@ecf.toronto.edu
 #include "uiuc_warnings_errors.h"
 //#include "uiuc_aircraft.h"
 
-SG_USING_STD(ifstream);
-SG_USING_STD(istringstream);
+using std::ifstream;
+using std::istringstream;
 
 class flapStruct {
 private:

diff --git a/src/FDM/UIUCModel/uiuc_gear.cpp b/src/FDM/UIUCModel/uiuc_gear.cpp
index 25ec75624d8c9adb972b75a648f27248c83641b3..85f30df4d04173e39b23223b79ecc23ef2339891 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_gear.cpp
+++ b/src/FDM/UIUCModel/uiuc_gear.cpp
@@ -74,7 +74,7 @@
 
 
 
-SG_USING_STD(cerr);
+using std::cerr;
 
 
 #define HEIGHT_AGL_WHEEL d_wheel_rwy_local_v[2]

diff --git a/src/FDM/UIUCModel/uiuc_menu.cpp b/src/FDM/UIUCModel/uiuc_menu.cpp
index f2917ebf81369871a3ca8525c22721dd741e9fec..58694c3f5b8351fe62b84262e8664a2014dd5d7a 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu.cpp
@@ -166,12 +166,12 @@
 
 #include "uiuc_menu.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void uiuc_menu( string aircraft_name )

diff --git a/src/FDM/UIUCModel/uiuc_menu_CD.cpp b/src/FDM/UIUCModel/uiuc_menu_CD.cpp
index e88f1ea7c2e91fb510d19de2ee88db31032ff665..44823d066a52a26c447e17d2e0e2229c4edaeedb 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_CD.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_CD.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_CD.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_CD( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_CL.cpp b/src/FDM/UIUCModel/uiuc_menu_CL.cpp
index d8cf1c8da484af06ad5a02b52c48ed1a1353907f..553d6d689d54506c881bfc467e6bf3244bfbb6ca 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_CL.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_CL.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_CL.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_CL( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_CY.cpp b/src/FDM/UIUCModel/uiuc_menu_CY.cpp
index 283aafdd0bd5ccb6a68703e8abb9b0d347159175..c9949d0d52e12d55078e9849ada85c7abe8cdb5f 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_CY.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_CY.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_CY.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_CY( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_Cm.cpp b/src/FDM/UIUCModel/uiuc_menu_Cm.cpp
index 4c16d62478d82308e1d473e27b5292c5d8e46692..ba21aab2a0bd0f7df358b92fd7532f006140a817 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_Cm.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_Cm.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_Cm.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_Cm( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_Cn.cpp b/src/FDM/UIUCModel/uiuc_menu_Cn.cpp
index 5592c0afb5da2e9efd57d18f8af09ac409c83f8a..cdd5977468ef23bdc8eeae9a25dfaac68e7b4e48 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_Cn.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_Cn.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_Cn.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_Cn( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_Croll.cpp b/src/FDM/UIUCModel/uiuc_menu_Croll.cpp
index 9f8bcad3e2c4e343111fa55f4f111ad2f48d0e5d..6161df2cbdb3780b01008df5141e63539f80f5e3 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_Croll.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_Croll.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_Croll.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_Cl( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp b/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp
index 8a5b5f2f0bf662fb66fa3635a13d6a45ecf81e0a..1a0c40947b183b6b08f33f92c20d66336db72948 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_controlSurface.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_controlSurface( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_engine.cpp b/src/FDM/UIUCModel/uiuc_menu_engine.cpp
index e9d2ddc3fd3d9e0e37c3615b739ffb4f2846354e..96ede0e3650378f8d3cf1e5a6d755558ea046246 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_engine.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_engine.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_engine.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_engine( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_fog.cpp b/src/FDM/UIUCModel/uiuc_menu_fog.cpp
index 4af9238be2b8e4ebe2afeca67601c6d3efb5958c..a8e7c395cea7e3369ec34ca8c3a5b133d2a4e40f 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_fog.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_fog.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_fog.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_fog( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_gear.cpp b/src/FDM/UIUCModel/uiuc_menu_gear.cpp
index a72bff72c61a0a519e8cb224aa8691370b74466b..7b1a9de83414f7944d4672b72f443d0846996080 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_gear.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_gear.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_gear.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_gear( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
index 8fd5a94fe69caf3be34dda0f65df74a4407e034e..e9050e81f42d3236c12daa3eb4926ccb2d732018 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_geometry.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_geometry( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_ice.cpp b/src/FDM/UIUCModel/uiuc_menu_ice.cpp
index df16cb5180ed76ae512a729de80ec8e9b500a724..f51929e6ac29f5081ff223b670650f26e8554956 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_ice.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_ice.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_ice.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_ice( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_init.cpp b/src/FDM/UIUCModel/uiuc_menu_init.cpp
index c58060a2d24346fc195cb93b0c89003531056ef0..889ef2eb488ea12f5e574fdafdf07e3ad3f36a5e 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_init.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_init.cpp
@@ -80,12 +80,12 @@
 
 #include "uiuc_menu_init.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_init( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_mass.cpp b/src/FDM/UIUCModel/uiuc_menu_mass.cpp
index a0c2029c3f7d9e42304684849ffe78ff6a8ab792..e956b6180854e34ec44f5ca6b47bf5d14a734c43 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_mass.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_mass.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_mass.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_mass( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_misc.cpp b/src/FDM/UIUCModel/uiuc_menu_misc.cpp
index 2a38efc4d381d402398204ff94f6767fc953734a..2817d24a1c5516f3a80a3f62724c848b0383c6d9 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_misc.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_misc.cpp
@@ -79,12 +79,12 @@
 
 #include "uiuc_menu_misc.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_misc( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_menu_record.cpp b/src/FDM/UIUCModel/uiuc_menu_record.cpp
index 5b62e146f3b957b305ff450bc673f8902ea89022..12701c9a8e7cece62c15f92b191d539d087289f7 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_record.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_record.cpp
@@ -82,12 +82,12 @@
 
 #include "uiuc_menu_record.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_record( const string& linetoken2, const string& linetoken3,

diff --git a/src/FDM/UIUCModel/uiuc_parsefile.h b/src/FDM/UIUCModel/uiuc_parsefile.h
index 911f3ef2793d994f692babe4e4a8c753257eedcf..f39b8c6c0bde91decc710428f840c651bdee0512 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_parsefile.h
+++ b/src/FDM/UIUCModel/uiuc_parsefile.h
@@ -7,10 +7,10 @@
 #include <list>
 #include <fstream>
 
-SG_USING_STD(list);
-SG_USING_STD(string);
-SG_USING_STD(getline);
-SG_USING_STD(ifstream);
+using std::list;
+using std::string;
+using std::getline;
+using std::ifstream;
 
 #define DELIMITERS " \t"
 #define COMMENT "#"

diff --git a/src/FDM/UIUCModel/uiuc_recorder.cpp b/src/FDM/UIUCModel/uiuc_recorder.cpp
index de7bd107efff6c0ecb28ffc9dbc34e274e1f8184..cd0ca2414392cf7c6a8fd64430b9f3bed2363125 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_recorder.cpp
+++ b/src/FDM/UIUCModel/uiuc_recorder.cpp
@@ -99,7 +99,7 @@
 
 #include "uiuc_recorder.h"
 
-SG_USING_STD(endl);            // -dw
+using std::endl;               // -dw
 
 void uiuc_recorder( double dt )
 {

diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index ded7a067b42ab3c5dd7f5ac1ff1b68dc038b9851..35ed164d4eb6c206b9eca0f22e5142f9d0587a20 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -102,8 +102,8 @@
 //#include "uiuc_network.h"
 #include "uiuc_get_flapper.h"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 extern "C" void uiuc_initial_init ();
 extern "C" void uiuc_defaults_inits ();

diff --git a/src/FDM/YASim/Rotor.cpp b/src/FDM/YASim/Rotor.cpp
index 4908f24f34db4cf8370f2cf9c535074e75eb671f..413984a813518338b9c098f3a5fee080ea2db954 100644 (file)
--- a/src/FDM/YASim/Rotor.cpp
+++ b/src/FDM/YASim/Rotor.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <iomanip>
 
-SG_USING_STD(setprecision);
+using std::setprecision;
 
 #ifdef TEST_DEBUG
 #include <stdio.h>

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 23eb9025095a46c283c9afd7f8f05346959f73dc..017ab0a55f22fa38caf79147fdd2445011070ce6 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -84,9 +84,9 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <FDM/groundcache.hxx>
 
-SG_USING_STD(list);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::list;
+using std::vector;
+using std::string;
 
 // This is based heavily on LaRCsim/ls_generic.h
 class FGInterface : public SGSubsystem {

diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx
index e272e96a9e76a9a1c37f6efa5d6c76a5e00bea80..09b76232f6a86d3b06f55032aabdc118335d1ea7 100644 (file)
--- a/src/GUI/dialog.hxx
+++ b/src/GUI/dialog.hxx
@@ -15,7 +15,7 @@
 #include <simgear/misc/sg_path.hxx>
 
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 
 // ugly temporary workaround for plib's lack of user defined class ids  FIXME

diff --git a/src/GUI/layout-test.cxx b/src/GUI/layout-test.cxx
index c006340898907c8f84bbd0969f1ce4b08806ede3..0c7e3fed2a21d953a51d0775f5cdfeab74cd303e 100644 (file)
--- a/src/GUI/layout-test.cxx
+++ b/src/GUI/layout-test.cxx
@@ -5,7 +5,7 @@
 #include <iostream>
 
 #include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/GL>
 #include <plib/pw.h>
 #include <plib/pu.h>
 #include <simgear/props/props.hxx>

diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx
index e3a97d57e40112330d481f2427e05ea8df528f11..eab4b7ff8c6d939b700fe5d1a71e6615fb45d100 100644 (file)
--- a/src/GUI/menubar.hxx
+++ b/src/GUI/menubar.hxx
@@ -13,10 +13,10 @@
 #include <plib/pu.h>
 
 #include <map>
-SG_USING_STD(map);
+using std::map;
 
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 
 class puMenuBar;

diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx
index 3fb1703d2d2a30211a8fe9a42b246f448bf50d13..6bc2707157eec18780bbf377ecab6b9441d24a75 100644 (file)
--- a/src/GUI/new_gui.hxx
+++ b/src/GUI/new_gui.hxx
@@ -22,9 +22,9 @@
 #include <vector>
 #include <map>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::vector;
+using std::map;
+using std::string;
 
 #include <Main/fg_props.hxx>
 

diff --git a/src/GUI/property_list.cxx b/src/GUI/property_list.cxx
index ae709d290c7ca25fd1c1528070dd0c6f2769fab7..2b63183ac2d4ccb3adae49375108bf6636edf3ed 100644 (file)
--- a/src/GUI/property_list.cxx
+++ b/src/GUI/property_list.cxx
@@ -31,7 +31,7 @@
 #include <iomanip>
 #include <iostream>
 #include <string>
-SG_USING_STD(string);
+using std::string;
 using std::cout;
 
 typedef string stdString;      // puObject has a "string" member

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 726aabbea01c0f0629443b5157d9697c28e7aba0..6f0176b4bce223e3de652c84daca475bc57423de 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -38,12 +38,12 @@
 #include <fstream>
 #include <string>
 
-SG_USING_STD(fstream);
-SG_USING_STD(cout);
-SG_USING_STD(cin);
-SG_USING_STD(endl);
-SG_USING_STD(ios);
-SG_USING_STD(string);
+using std::fstream;
+using std::cout;
+using std::cin;
+using std::endl;
+using std::ios;
+using std::string;
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 21d96e6582f12d9dd16d9aed0f3fdbc346a0de3f..7197b27f9ed614ba9706ea20c43821d8ba771ff4 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -59,10 +59,10 @@
 #include <Scenery/scenery.hxx>
 #include <Main/renderer.hxx>
 
-SG_USING_STD(ifstream);
-SG_USING_STD(ostringstream);
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::ifstream;
+using std::ostringstream;
+using std::string;
+using std::vector;
 
 void mouseClickHandler(int button, int updown, int x, int y, bool mainWindow, const osgGA::GUIEventAdapter*);
 void mouseMotionHandler(int x, int y);

diff --git a/src/Input/input.hxx b/src/Input/input.hxx
index 9491685ec7315ce46857428a3d3a19e6a330175f..e71d8620e17ca37307784c2a9154ee4081c35177 100644 (file)
--- a/src/Input/input.hxx
+++ b/src/Input/input.hxx
@@ -48,8 +48,8 @@
 #include <list>
 #include <vector>
 
-SG_USING_STD(map);
-SG_USING_STD(vector);
+using std::map;
+using std::vector;
 
 
 \f

diff --git a/src/Input/jsinput.cxx b/src/Input/jsinput.cxx
index 6f6a9eda46184db56fdfa3504dc49508f65730f6..b57f828d2bb99d1a41c1062684b42631f79ba645 100644 (file)
--- a/src/Input/jsinput.cxx
+++ b/src/Input/jsinput.cxx
@@ -22,9 +22,9 @@
 
 #include <iostream>
 
-SG_USING_STD(cout);
-SG_USING_STD(cin);
-SG_USING_STD(endl);
+using std::cout;
+using std::cin;
+using std::endl;
 
 #include "jsinput.h"
 

diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx
index a34858471fffbf942e1198e1d54633c88e07de3c..05e4d6e276745a722cc05a4d1cc54f07bd468655 100644 (file)
--- a/src/Instrumentation/HUD/HUD.cxx
+++ b/src/Instrumentation/HUD/HUD.cxx
@@ -31,14 +31,13 @@
 
 #include <simgear/constants.h>
 #include <simgear/misc/sg_path.hxx>
+#include <osg/GLU>
 
 #include <Main/globals.hxx>
 #include <Main/viewmgr.hxx>
 
 #include "HUD.hxx"
 
-#include SG_GLU_H
-
 
 static float clamp(float f)
 {

diff --git a/src/Instrumentation/HUD/HUD.hxx b/src/Instrumentation/HUD/HUD.hxx
index a6d95bdb3ffd1c76018bf1dbdfe577674e4b725d..7655a31bd5051812833f1f7dd67eccfd877059d6 100644 (file)
--- a/src/Instrumentation/HUD/HUD.hxx
+++ b/src/Instrumentation/HUD/HUD.hxx
@@ -33,8 +33,8 @@
 #include <deque>
 #include <fstream>
 
-SG_USING_STD(deque);
-SG_USING_STD(vector);
+using std::deque;
+using std::vector;
 
 #include <osg/State>
 

diff --git a/src/Instrumentation/HUD/HUD_runway.cxx b/src/Instrumentation/HUD/HUD_runway.cxx
index c3dc5e19c025fb30604db13665195256be08886e..67d4b857dd0ec3f6a903f9161e72e9b100829113 100644 (file)
--- a/src/Instrumentation/HUD/HUD_runway.cxx
+++ b/src/Instrumentation/HUD/HUD_runway.cxx
@@ -26,7 +26,7 @@
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/polar3d.hxx>
-#include SG_GLU_H
+#include <osg/GLU>
 
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>

diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx
index ffc59c5f9934230d661fb75bb38aa967ed7f1f3a..81a9b0aeb8b02eecdfeb1fe0f3d10cbbaf8a5ea0 100644 (file)
--- a/src/Instrumentation/KLN89/kln89.cxx
+++ b/src/Instrumentation/KLN89/kln89.cxx
@@ -47,7 +47,7 @@
 #include <Main/fg_props.hxx>
 #include <simgear/math/point3d.hxx>
 
-SG_USING_STD(cout);
+using std::cout;
 
 KLN89::KLN89(RenderArea2D* instrument) 
 : DCLGPS(instrument) {

diff --git a/src/Instrumentation/adf.hxx b/src/Instrumentation/adf.hxx
index 69831a6f22093777c7bcb98f9c58591cdf2fa225..0feac829db1cd041d842f25722777627d5859de0 100644 (file)
--- a/src/Instrumentation/adf.hxx
+++ b/src/Instrumentation/adf.hxx
@@ -19,7 +19,7 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <Sound/morse.hxx>
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**

diff --git a/src/Instrumentation/dclgps.cxx b/src/Instrumentation/dclgps.cxx
index cafa056c1fdb7ecd502bc321c10474a2b6b83880..8707ccf1ed12ed8e0ac7207110eb151909a901eb 100644 (file)
--- a/src/Instrumentation/dclgps.cxx
+++ b/src/Instrumentation/dclgps.cxx
@@ -29,7 +29,7 @@
 #include <simgear/structure/commands.hxx>
 #include <Main/fg_props.hxx>
 #include <iostream>
-SG_USING_STD(cout);
+using std::cout;
 
 //using namespace std;
 

diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 76b8974bf71aa4c54cdbaa0132e9522888c41b38..aff76facf897f1441b919fa1e6ee8224f00ffa60 100644 (file)
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -24,7 +24,7 @@
 
 #include "gps.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 GPS::GPS ( SGPropertyNode *node)

diff --git a/src/Instrumentation/kr_87.cxx b/src/Instrumentation/kr_87.cxx
index c909b7ceebe84f1e8756514d36d110756a2a4d07..4749ce856a47d768119958b61d4128e4b6b70016 100644 (file)
--- a/src/Instrumentation/kr_87.cxx
+++ b/src/Instrumentation/kr_87.cxx
@@ -36,7 +36,7 @@
 #include "kr_87.hxx"
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 static int play_count = 0;
 static time_t last_time = 0;

diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx
index 35179c992c653e6bdb63279e93862f5a0647877b..1cb91f0af1fe4256c3a6b7eaf318049716d10df5 100644 (file)
--- a/src/Instrumentation/marker_beacon.cxx
+++ b/src/Instrumentation/marker_beacon.cxx
@@ -36,7 +36,7 @@
 #include "marker_beacon.hxx"
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 
 // Constructor

diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index 43cbb1e842edbad5ef9491a4f586b730815e211e..fc34f0b792ed98c11b50348c13387b6a79142020 100755 (executable)
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@@ -72,7 +72,7 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/structure/exception.hxx>
 
-SG_USING_STD(string);
+using std::string;
 
 #include "Airports/runways.hxx"
 #include "Airports/simple.hxx"

diff --git a/src/Instrumentation/mk_viii.hxx b/src/Instrumentation/mk_viii.hxx
index 722abddf0db227ea276b638d79a2f9bd9750266b..bf6a2c44476a532ef93771b300704049d37eff08 100755 (executable)
--- a/src/Instrumentation/mk_viii.hxx
+++ b/src/Instrumentation/mk_viii.hxx
@@ -32,9 +32,9 @@
 #include <simgear/sound/sample_openal.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
-SG_USING_STD(vector);
-SG_USING_STD(deque);
-SG_USING_STD(map);
+using std::vector;
+using std::deque;
+using std::map;
 
 #include "Airports/runways.hxx"
 #include "Airports/simple.hxx"

diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx
index 5e6d6585c8cb22f5c5038dc9f54092f5d8144540..a208a14d61b9658a76e3c00e2dc1d22c5ba03ba9 100644 (file)
--- a/src/Instrumentation/navradio.cxx
+++ b/src/Instrumentation/navradio.cxx
@@ -40,7 +40,7 @@
 #include "navradio.hxx"
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 
 // Constructor

diff --git a/src/Instrumentation/render_area_2d.cxx b/src/Instrumentation/render_area_2d.cxx
index e1155fb68c5ecfdbd058ae1010b1b4185ff4c525..ae8784c542ace2433402bd9bb615d8541171db54 100644 (file)
--- a/src/Instrumentation/render_area_2d.cxx
+++ b/src/Instrumentation/render_area_2d.cxx
@@ -28,7 +28,6 @@
 
 #include "render_area_2d.hxx"
 
-
 static const float dummy_normals[][3] = {{0.0f, 0.0f, 0.0f},
                                          {0.0f, 0.0f, 0.0f},
                                          {0.0f, 0.0f, 0.0f},

diff --git a/src/Instrumentation/render_area_2d.hxx b/src/Instrumentation/render_area_2d.hxx
index de41798d05b2deb94ff8b3f577619506d9b1c657..6b4dc32301ada3cf10b25ad5bd2de73edd7d5360 100644 (file)
--- a/src/Instrumentation/render_area_2d.hxx
+++ b/src/Instrumentation/render_area_2d.hxx
@@ -33,7 +33,7 @@
 
 #include <vector>
 
-SG_USING_STD(vector);
+using std::vector;
 
 enum RA2DDrawingType {
        RA2D_LINE,

diff --git a/src/Instrumentation/tacan.cxx b/src/Instrumentation/tacan.cxx
index 6411abff5eb2f14d5d89ab7994dcc1c607209c2a..59066c4539bf634910e3163c6f7e586a59480c91 100755 (executable)
--- a/src/Instrumentation/tacan.cxx
+++ b/src/Instrumentation/tacan.cxx
@@ -17,7 +17,7 @@
 
 #include "tacan.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 /**

diff --git a/src/Instrumentation/wxradar.cxx b/src/Instrumentation/wxradar.cxx
index 613a3c24372c9e69349666cda0c327ebfb543a3c..a97a6fb738224ef6a2419b8ac29a9eef2556f0b4 100644 (file)
--- a/src/Instrumentation/wxradar.cxx
+++ b/src/Instrumentation/wxradar.cxx
@@ -46,12 +46,12 @@
 
 #include <sstream>
 #include <iomanip>
-SG_USING_STD(stringstream);
-SG_USING_STD(endl);
-SG_USING_STD(setprecision);
-SG_USING_STD(fixed);
-SG_USING_STD(setw);
-SG_USING_STD(setfill);
+using std::stringstream;
+using std::endl;
+using std::setprecision;
+using std::fixed;
+using std::setw;
+using std::setfill;
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>

diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx
index a756d5f5cf33d7fac3d12d25e3f75ebee738bf9d..8f3e5122a7ba1e61cbf297e1d728178135951ab8 100644 (file)
--- a/src/Instrumentation/wxradar.hxx
+++ b/src/Instrumentation/wxradar.hxx
@@ -36,8 +36,8 @@
 #include <AIModel/AIManager.hxx>
 #include <vector>
 #include <string>
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 class FGAIBase;
 class FGODGauge;

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index e9394211a786f325298260073eb148d19d258081..d0871fb0a76163cfe797f30908fbb28a43ad8d3e 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -39,8 +39,8 @@
 #include <simgear/debug/logstream.hxx>
 
 #include <iostream>
-SG_USING_STD(cerr);
-SG_USING_STD(endl);
+using std::cerr;
+using std::endl;
 
 #include "main.hxx"
 #include "globals.hxx"

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 96e7175afcd0f7e371272349a5ae84059368ab04..ba47d0bfde6bbb69f2dc96280d72b907692ce320 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -45,9 +45,9 @@
 #include "viewmgr.hxx"
 #include "main.hxx"
 
-SG_USING_STD(string);
-SG_USING_STD(ifstream);
-SG_USING_STD(ofstream);
+using std::string;
+using std::ifstream;
+using std::ofstream;
 
 
 \f

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 9c7eb9d99c711eb21bcf9b8cd446f62a6c383b1b..29134738a7730c7abcbe15b9db432545e3f60974 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -123,8 +123,11 @@
 #include "viewmgr.hxx"
 #include "main.hxx"
 
-SG_USING_STD(string);
+#ifdef __APPLE__
+#  include <CoreFoundation/CoreFoundation.h>
+#endif
 
+using std::string;
 
 class Sound;
 extern const char *default_root;

diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index 281614cfe9b1ca646d4ec8c3c9aae4152a048a7b..e4a254fd09c89c7cad0680420327dae950e4aa5d 100644 (file)
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -42,7 +42,7 @@
 
 #include <Airports/simple.hxx>
 
-SG_USING_STD(string);
+using std::string;
 
 
 // Read in configuration (files and command line optoins) but only set

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index d8ffefe9a8f1d4b8bd15aef68f31e6d7bbf6e975..e0e2a5c241957adab5f5061b0d8447c47bfff7f2 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -67,7 +67,7 @@
 #include "globals.hxx"
 #include "fg_io.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 FGIO::FGIO()
@@ -75,7 +75,7 @@ FGIO::FGIO()
 }
 
 #include <algorithm>
-SG_USING_STD(for_each);
+using std::for_each;
 
 static void delete_ptr( FGProtocol* p ) { delete p; }
 

diff --git a/src/Main/fg_io.hxx b/src/Main/fg_io.hxx
index b0da8f0d9f65619ff19b820f295c588e647c8b1b..b470aa59e0b00c2f35b367d2c3c91e62ef2cc5de 100644 (file)
--- a/src/Main/fg_io.hxx
+++ b/src/Main/fg_io.hxx
@@ -31,8 +31,8 @@
 #include <vector>
 #include <string>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 class FGProtocol;
 

diff --git a/src/Main/fg_os.cxx b/src/Main/fg_os.cxx
index 3aec6ab7fa3eac6ee0ccad31419942b0f3ea1368..0ecde2c921f7dc8a67b36ddaf4b43fa23499b085 100644 (file)
--- a/src/Main/fg_os.cxx
+++ b/src/Main/fg_os.cxx
@@ -12,8 +12,11 @@
 
 #include <simgear/compiler.h>
 
-#include SG_GLUT_H
-
+#if defined( __APPLE__)
+# include <GLUT/glut.h>
+#else
+# include <GL/glut.h>
+#endif
 #include <plib/pu.h>
 
 #include <Scenery/scenery.hxx>

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 957cd9c3baefaf23859ceee056bf9a3b1fc037ca..f4b410a70b7b29e17c3b9dcaebe709ab47ab6d82 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -44,8 +44,8 @@
 #include "globals.hxx"
 #include "fg_props.hxx"
 
-SG_USING_STD(istream);
-SG_USING_STD(ostream);
+using std::istream;
+using std::ostream;
 
 static bool winding_ccw = true; // FIXME: temporary
 

diff --git a/src/Main/logger.cxx b/src/Main/logger.cxx
index adac4288282f5242d91141b411ef3a0ccd71af42..71ee3f5546c7801be888b1fdbebb3b49d1aae742 100644 (file)
--- a/src/Main/logger.cxx
+++ b/src/Main/logger.cxx
@@ -8,9 +8,9 @@
 #include <fstream>
 #include <string>
 
-SG_USING_STD(ofstream);
-SG_USING_STD(endl);
-SG_USING_STD(string);
+using std::ofstream;
+using std::endl;
+using std::string;
 
 #include <simgear/debug/logstream.hxx>
 

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 0882528cbc762236233622005859bc182bd34943..a36ad671d2fe20bcaf537e565d08557f499fc337 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -60,8 +60,8 @@
 #include "viewmgr.hxx"
 
 
-SG_USING_STD(string);
-SG_USING_STD(sort);
+using std::string;
+using std::sort;
 
 #ifndef VERSION
 #define VERSION "CVS "__DATE__

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index 3ba719688cdfa1a478460defe1d01b97e7d13aea..0986e91ea47a71c93b9595c25affa837743abc22 100644 (file)
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -25,7 +25,7 @@
 #include <cstdlib>
 
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/debug/logstream.hxx>
 

diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx
index 1823cbbf45b557959446e88d5ceff6cc32d24a96..f593715684eb9cfb6daace273d69f24cfeca71b3 100644 (file)
--- a/src/Main/viewmgr.hxx
+++ b/src/Main/viewmgr.hxx
@@ -36,7 +36,7 @@
 #include "fg_props.hxx"
 #include "viewer.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 // Define a structure containing view information

diff --git a/src/Model/acmodel.hxx b/src/Model/acmodel.hxx
index cbab40602d1570d34b4347b64dc8935c78012e22..1ef1f1b9927a2b1e411e65b8767c633e3aab2b4f 100644 (file)
--- a/src/Model/acmodel.hxx
+++ b/src/Model/acmodel.hxx
@@ -13,8 +13,8 @@
 #include <vector>
 #include <string>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include <osg/ref_ptr>
 #include <osg/Group>

diff --git a/src/Model/model_panel.cxx b/src/Model/model_panel.cxx
index ea24a2fa2e0c6fb0d503b0b83cf387388fc004ee..4715ecf25cf1a2d20da6b028b5f81d6c820f3ce2 100644 (file)
--- a/src/Model/model_panel.cxx
+++ b/src/Model/model_panel.cxx
@@ -19,7 +19,7 @@
 
 #include "model_panel.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 using namespace simgear;
 

diff --git a/src/Model/model_panel.hxx b/src/Model/model_panel.hxx
index 0b82d3313289d3f777e55a913b6762865a2ff382..2ee67051a45803535302a54d519e3d18dc21669c 100644 (file)
--- a/src/Model/model_panel.hxx
+++ b/src/Model/model_panel.hxx
@@ -12,7 +12,7 @@
 
 #include <vector>
 
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>

diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index a7f543f1ebada0c253283faca328533b254153f0..2b547cf027486a0cfcefbad6f69f98329ada551c 100644 (file)
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -25,7 +25,7 @@
 
 #include "modelmgr.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 using namespace simgear;
 

diff --git a/src/Model/modelmgr.hxx b/src/Model/modelmgr.hxx
index b26bc05e39215b0c626f40721e4f42aa4b7a432e..0b1cf53435248d91511b2181c75682fd5962b229 100644 (file)
--- a/src/Model/modelmgr.hxx
+++ b/src/Model/modelmgr.hxx
@@ -15,7 +15,7 @@
 #include <simgear/compiler.h>  // for SG_USING_STD
 #include <simgear/structure/subsystem_mgr.hxx>
 
-SG_USING_STD(vector);
+using std::vector;
 
 // Don't pull in headers, since we don't need them here.
 class SGPropertyNode;

diff --git a/src/Model/panelnode.cxx b/src/Model/panelnode.cxx
index 8413da54ca018d677c1934c4badb6fa16dfe9f42..84448b866b3314a292d142a4a17c80f5c71de851 100644 (file)
--- a/src/Model/panelnode.cxx
+++ b/src/Model/panelnode.cxx
@@ -13,7 +13,7 @@
 #include <Cockpit/panel_io.hxx>
 #include "panelnode.hxx"
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 // Static (!) handling for all 3D panels in the program.

diff --git a/src/MultiPlayer/multiplaymgr.hxx b/src/MultiPlayer/multiplaymgr.hxx
index 45f1c740a79741dee9197f27c0a86591fce404b9..61cd2c49cab35a440111df3b2b5be55b93b7eb85 100644 (file)
--- a/src/MultiPlayer/multiplaymgr.hxx
+++ b/src/MultiPlayer/multiplaymgr.hxx
@@ -38,9 +38,9 @@
 #endif
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/compiler.h>
 #include <simgear/props/props.hxx>

diff --git a/src/Navaids/awynet.cxx b/src/Navaids/awynet.cxx
index b3bf303fccabf12c41bff072769952bb9b67373a..b2865b4e1066389fd977f6051002e8fbfa8ab5a5 100755 (executable)
--- a/src/Navaids/awynet.cxx
+++ b/src/Navaids/awynet.cxx
@@ -35,7 +35,7 @@
 
 #include "awynet.hxx"
 
-SG_USING_STD(sort);
+using std::sort;
 
 using std::cerr;
 using std::endl;

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index 8a4925e086c0b183f889f3fdb99179c3637aa286..c5451be573dde2aa3b490d6d743ec390edb58039 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -36,8 +36,8 @@
 
 #include <string>
 
-// SG_USING_STD(cout);
-// SG_USING_STD(endl);
+// using std::cout;
+// using std::endl;
 
 
 class FGFix {

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 980949c9a1dfa17bb788d5ec130d769fed97a5b9..36bdf420d44ea7c8ae93ee1f31fc4b91458b514e 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -30,7 +30,7 @@
 #include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
-SG_USING_STD(pair);
+using std::pair;
 
 
 // Constructor

diff --git a/src/Navaids/fixlist.hxx b/src/Navaids/fixlist.hxx
index 91d0c539b2ccf88bb3f3334500ee867a8a42aee6..cf81e8ce2519b5325916aa3e37f8cbee50fc5e99 100644 (file)
--- a/src/Navaids/fixlist.hxx
+++ b/src/Navaids/fixlist.hxx
@@ -34,9 +34,9 @@
 
 #include "fix.hxx"
 
-SG_USING_STD(multimap);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::multimap;
+using std::vector;
+using std::string;
 
 // fix names may be globally non-unique.  Allow for this.
 typedef multimap < string, FGFix > fix_map_type;

diff --git a/src/Navaids/navdb.hxx b/src/Navaids/navdb.hxx
index 7c477792cb81e4dd4141a4b37e02c66be7935d93..825fa1e621f7b9a3c8360ee8bc45a60bb31cc781 100644 (file)
--- a/src/Navaids/navdb.hxx
+++ b/src/Navaids/navdb.hxx
@@ -35,9 +35,9 @@
 #include "navlist.hxx"
 #include "fixlist.hxx"
 
-// SG_USING_STD(map);
-// SG_USING_STD(vector);
-// SG_USING_STD(string);
+// using std::map;
+// using std::vector;
+// using std::string;
 
 
 // load and initialize the navigational databases

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index ceab1d68b795e14056b2d3e3d4bb795852a3d2c7..b975f95b0e9b197c229f605b4a39fdd4b1ee45f2 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -36,9 +36,9 @@
 
 #include "navrecord.hxx"
 
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::map;
+using std::vector;
+using std::string;
 
 
 

diff --git a/src/Network/ATC-Inputs.cxx b/src/Network/ATC-Inputs.cxx
index f90e89129fae9bb8e0bcc9f267b8828d9ad7c01b..378f215c8df4fabc8bdc2115375cd1c7a29401e7 100644 (file)
--- a/src/Network/ATC-Inputs.cxx
+++ b/src/Network/ATC-Inputs.cxx
@@ -47,7 +47,7 @@
 
 #include "ATC-Inputs.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 

diff --git a/src/Network/ATC-Main.cxx b/src/Network/ATC-Main.cxx
index 719e173d29e5d38ff6bf5600556ff60f5cd63d61..962996d62bc661fc43c2fc93432d07019f142ffe 100644 (file)
--- a/src/Network/ATC-Main.cxx
+++ b/src/Network/ATC-Main.cxx
@@ -52,7 +52,7 @@
 
 #include "ATC-Main.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 // Lock the ATC hardware

diff --git a/src/Network/ATC-Outputs.cxx b/src/Network/ATC-Outputs.cxx
index eaab9f9c9893ec71da7a825b3b215f1e2a46928a..79a9dcb26df3b1b74c2df84bb8d9d5bb25f11d8b 100644 (file)
--- a/src/Network/ATC-Outputs.cxx
+++ b/src/Network/ATC-Outputs.cxx
@@ -47,7 +47,7 @@
 
 #include "ATC-Outputs.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 

diff --git a/src/Network/AV400.hxx b/src/Network/AV400.hxx
index bb1fe9917a9699489f6fff6293318a7a60810b5b..02c0fcb0d23c1a93964a0ef01f853d1d45e24c8b 100644 (file)
--- a/src/Network/AV400.hxx
+++ b/src/Network/AV400.hxx
@@ -31,7 +31,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGAV400 : public FGProtocol {

diff --git a/src/Network/atlas.hxx b/src/Network/atlas.hxx
index 5af40b5b80a4a03cf365d2952fde6430ca3b872a..c91355afd6e7cff3bb2776e2872264b228774559 100644 (file)
--- a/src/Network/atlas.hxx
+++ b/src/Network/atlas.hxx
@@ -31,7 +31,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGAtlas : public FGProtocol {

diff --git a/src/Network/garmin.hxx b/src/Network/garmin.hxx
index 8f02414e17a3e521d0b0208167fbde16a1c3ae0b..60f2420b66ea1b76fa0e8d51961e2042730e43db 100644 (file)
--- a/src/Network/garmin.hxx
+++ b/src/Network/garmin.hxx
@@ -31,7 +31,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGGarmin : public FGProtocol {

diff --git a/src/Network/generic.hxx b/src/Network/generic.hxx
index d7db8cf68b0c7c1740c691a8e4111f52ca5179c3..b2d0df18ef1d34d73c97a6305b6058cbe66a9ded 100644 (file)
--- a/src/Network/generic.hxx
+++ b/src/Network/generic.hxx
@@ -31,7 +31,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGGeneric : public FGProtocol {

diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx
index 9991b90898d41f78a4fdda74c4e13dbf02f5fdcb..7332284b86240a2dc7a0ad3db82644e8539a172d 100644 (file)
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -47,7 +47,7 @@
 
 #include "httpd.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 bool FGHttpd::open() {
     if ( is_enabled() ) {

diff --git a/src/Network/joyclient.hxx b/src/Network/joyclient.hxx
index 0a2f7485af96b91550ae0bdd360e39b0d4ea5212..818081e1baa0f4a007b23a0964818d6023b53324 100644 (file)
--- a/src/Network/joyclient.hxx
+++ b/src/Network/joyclient.hxx
@@ -33,7 +33,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGJoyClient : public FGProtocol {

diff --git a/src/Network/jpg-httpd.cxx b/src/Network/jpg-httpd.cxx
index 8ef2c4357277e6adfaf0e6c2ee9251fb8ba14068..208a6a71b0177bb82fab2dbf09d9e536501bb87a 100644 (file)
--- a/src/Network/jpg-httpd.cxx
+++ b/src/Network/jpg-httpd.cxx
@@ -54,7 +54,7 @@
 #include <osgUtil/SceneView>
 extern osg::ref_ptr<osgUtil::SceneView> sceneView;
 
-SG_USING_STD(string);
+using std::string;
 
 
 bool FGJpegHttpd::open() {

diff --git a/src/Network/jsclient.hxx b/src/Network/jsclient.hxx
index 1e1d3274d130c1c02fe3a480bfdf0fa1105de07f..a25c623e9fe8e68c8394ac26984f34bce2cbaf09 100644 (file)
--- a/src/Network/jsclient.hxx
+++ b/src/Network/jsclient.hxx
@@ -34,7 +34,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGJsClient : public FGProtocol {

diff --git a/src/Network/lfsglass.cxx b/src/Network/lfsglass.cxx
index e8e6adbb92c6d7331eabc55bfd4e73c36d5a25f9..ea67689923444708f8fd4f3dcc83434865db3abf 100644 (file)
--- a/src/Network/lfsglass.cxx
+++ b/src/Network/lfsglass.cxx
@@ -41,7 +41,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
-SG_USING_STD(vector);
+using std::vector;
 
 FGLFSGlass::FGLFSGlass() : 
        press_node(fgGetNode("/environment/pressure-inhg[0]", true)),

diff --git a/src/Network/multiplay.cxx b/src/Network/multiplay.cxx
index 68072ae22195178c7af5e5e00e2e57d69567390b..44af02ad5d1481ac88f78da5083ef71cc43b006f 100644 (file)
--- a/src/Network/multiplay.cxx
+++ b/src/Network/multiplay.cxx
@@ -42,7 +42,7 @@
 
 #include "multiplay.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 // These constants are provided so that the ident command can list file versions.

diff --git a/src/Network/multiplay.hxx b/src/Network/multiplay.hxx
index db92b7580bf018738d87356132ff4adb175f68a5..0d5563c0e03669236878ecb5b82076c71ede0ca7 100644 (file)
--- a/src/Network/multiplay.hxx
+++ b/src/Network/multiplay.hxx
@@ -40,7 +40,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 /****************************************************************

diff --git a/src/Network/native.hxx b/src/Network/native.hxx
index a3ae1ea1289f89897c616fb2c44a7b2c6c646b4b..262ca24920c9a4df87d4f025c2ba5a0426546fa7 100644 (file)
--- a/src/Network/native.hxx
+++ b/src/Network/native.hxx
@@ -33,7 +33,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGNative : public FGProtocol {

diff --git a/src/Network/native_ctrls.hxx b/src/Network/native_ctrls.hxx
index bc57e58acfaf8ba7b5a9a269694bdab131638fce..fe90e79d9509479b545814b58eaddc025cfea6b2 100644 (file)
--- a/src/Network/native_ctrls.hxx
+++ b/src/Network/native_ctrls.hxx
@@ -33,7 +33,7 @@
 #include "protocol.hxx"
 #include "net_ctrls.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 class FGNativeCtrls : public FGProtocol {
 

diff --git a/src/Network/nmea.hxx b/src/Network/nmea.hxx
index 55acfb693d0a7e795b1cfd9c503aa121191d23fb..0549b70145f5ce05bd8b033a33b4ad5282b38d5a 100644 (file)
--- a/src/Network/nmea.hxx
+++ b/src/Network/nmea.hxx
@@ -31,7 +31,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGNMEA : public FGProtocol {

diff --git a/src/Network/opengc.cxx b/src/Network/opengc.cxx
index 0bf49161b7a4470cd1624f6bda5bacbe783c2563..2babd221cb986196e023abd13dd7fe4216019ccc 100644 (file)
--- a/src/Network/opengc.cxx
+++ b/src/Network/opengc.cxx
@@ -42,7 +42,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
-SG_USING_STD(vector);
+using std::vector;
 
 FGOpenGC::FGOpenGC() : 
        press_node(fgGetNode("/environment/pressure-inhg[0]", true)),

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index ec1a924e24c10493739f2aeb5ad4826ae9a63886..fb5f3a92e55965243dedb7f1ba8e4a01a85db7bb 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -44,8 +44,8 @@
 
 #include "props.hxx"
 
-SG_USING_STD(stringstream);
-SG_USING_STD(ends);
+using std::stringstream;
+using std::ends;
 
 using std::cout;
 using std::endl;

diff --git a/src/Network/props.hxx b/src/Network/props.hxx
index 35bf73488a5c9ec606b63297d889eb21b0021b34..bb661aed1e35676717f34efff8c1d83c99e2e26d 100644 (file)
--- a/src/Network/props.hxx
+++ b/src/Network/props.hxx
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include <plib/netChannel.h>
 

diff --git a/src/Network/protocol.hxx b/src/Network/protocol.hxx
index 5472e4a6aac61461c9441699193dacbf5c51ca80..03cf8357d9ed3099e59610deb8a6dd1ac8f9fa8e 100644 (file)
--- a/src/Network/protocol.hxx
+++ b/src/Network/protocol.hxx
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 
 #define FG_MAX_MSG_SIZE 16384
@@ -100,7 +100,7 @@ typedef io_container::iterator io_iterator;
 typedef io_container::const_iterator const_io_iterator;
 
 #include <stdexcept>
-SG_USING_STD(invalid_argument);
+using std::invalid_argument;
 
 //namespace flightgear { namespace network {
 class FGProtocolConfigError : public invalid_argument

diff --git a/src/Network/pve.hxx b/src/Network/pve.hxx
index bf79e3acd76dc7b93d12d9175eeb614dac5f567a..929e9e1a305ca74c03c3158755ea313934e8901a 100644 (file)
--- a/src/Network/pve.hxx
+++ b/src/Network/pve.hxx
@@ -31,7 +31,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGPVE : public FGProtocol {

diff --git a/src/Network/ray.hxx b/src/Network/ray.hxx
index 0de5bd35ab591584ae7b49205fe1eeb12e7aa409..d304c408f380bd5f520053a6177753b8b81c7d67 100644 (file)
--- a/src/Network/ray.hxx
+++ b/src/Network/ray.hxx
@@ -33,7 +33,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGRAY : public FGProtocol {

diff --git a/src/Network/rul.hxx b/src/Network/rul.hxx
index f628da370fa69bd65c64fb5e14f4c4e2e8aece84..b19b9556d1ae69d1c2af18470fdb2ecdf52e0348 100644 (file)
--- a/src/Network/rul.hxx
+++ b/src/Network/rul.hxx
@@ -32,7 +32,7 @@
 
 #include "protocol.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 class FGRUL : public FGProtocol {

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index d1bf0a4c8e8f952cfb0775ff0d0a4f7ad859c509..8c57159c466baa772c6fd9265693754e5d147007 100644 (file)
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -8,7 +8,7 @@
 #include <simgear/xml/easyxml.hxx>
 
 #include <map>
-SG_USING_STD(map);
+using std::map;
 
 
 class FGNasalScript;

diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx
index 0fd4a2ff2bdfbe880f42cc236729c91dff120d49..8822806803f55fe45c733b30813a093ca155dc76 100644 (file)
--- a/src/Sound/fg_fx.hxx
+++ b/src/Sound/fg_fx.hxx
@@ -32,8 +32,8 @@
 #include <simgear/sound/sample_openal.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
-SG_USING_STD(queue);
-SG_USING_STD(vector);
+using std::queue;
+using std::vector;
 
 class SGXmlSound;
 

diff --git a/src/Sound/voice.hxx b/src/Sound/voice.hxx
index 117ee3aadeaeadf42889f8931705b5696932426b..39dae579ac1cac98f792c2416e92729923468f86 100644 (file)
--- a/src/Sound/voice.hxx
+++ b/src/Sound/voice.hxx
@@ -44,10 +44,10 @@
 #  include <simgear/threads/SGQueue.hxx>
 #else
 #  include <queue>
-   SG_USING_STD(queue);
+   using std::queue;
 #endif // ENABLE_THREADS
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 

diff --git a/src/Systems/electrical.hxx b/src/Systems/electrical.hxx
index 1e660e471a0738b3bf6beb7888e828c46bd65481..a9e85039bd5682ae18f22191ac2261c9fc0d115a 100644 (file)
--- a/src/Systems/electrical.hxx
+++ b/src/Systems/electrical.hxx
@@ -35,8 +35,8 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>

diff --git a/src/Systems/pitot.hxx b/src/Systems/pitot.hxx
index 4c4677961e0f55a6989268f91a8958ad51c31de5..9d97dee40a307f561b3938d39a000e82cd20ce21 100644 (file)
--- a/src/Systems/pitot.hxx
+++ b/src/Systems/pitot.hxx
@@ -14,7 +14,7 @@
 #include <simgear/compiler.h>
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>

diff --git a/src/Traffic/SchedFlight.hxx b/src/Traffic/SchedFlight.hxx
index 4f85ed9931d098d53dc1d3bcd78c1be204791e3a..63ba6c7fd403746a44cdb7a560aa95520b5d49f9 100644 (file)
--- a/src/Traffic/SchedFlight.hxx
+++ b/src/Traffic/SchedFlight.hxx
@@ -43,7 +43,7 @@
 
 using namespace std;
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 class FGScheduledFlight

diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index 80402487dcf7b620c181eb9da8c939c1f7573a8d..3a8eb5513cdc5fd180927dbbd8cb7b078d2aea4e 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -70,7 +70,7 @@
 
 #include "TrafficMgr.hxx"
 
-SG_USING_STD(sort);
+using std::sort;
  
 /******************************************************************************
  * TrafficManager

diff --git a/tests/est-epsilon.c b/tests/est-epsilon.c
index 3b0efaf806d07afda1cd63423a68392e15a1a5fd..5ff0a8aca8a763065d14032b7d4476100c58678d 100644 (file)
--- a/tests/est-epsilon.c
+++ b/tests/est-epsilon.c
@@ -9,9 +9,11 @@
 #include <stdio.h>
 
 #include <simgear/compiler.h>
-
-#include SG_GLUT_H
-
+#if defined( __APPLE__)
+# include <OpenGL/OpenGL.h>
+#else
+# include <GL/gl.h>
+#endif
 
 int main() {
     GLfloat a, t;

diff --git a/tests/gl-info.c b/tests/gl-info.c
index 4aff41db650bb716bae89640294cf1f1771f7f6a..7d56fe81158d60ceab5a03c305f579bc45581275 100644 (file)
--- a/tests/gl-info.c
+++ b/tests/gl-info.c
@@ -19,8 +19,13 @@ Date: Fri, 24 Apr 1998 07:33:51 -0800
 #include <stdlib.h>
 
 #include <simgear/compiler.h>
-
-#include SG_GLUT_H
+#if defined( __APPLE__)
+# include <OpenGL/OpenGL.h>
+# include <GLUT/glut.h>
+#else
+# include <GL/gl.h>
+# include <GL/glut.h>
+#endif
 
 
 void getPrints ( GLenum token, char *string )

diff --git a/tests/test-env-map.cxx b/tests/test-env-map.cxx
index 6d369efc620c3e44d9207efc1729c98e22c4a181..c3377bb3369e2c8fa7791d8ff6000d5d49e266f1 100644 (file)
--- a/tests/test-env-map.cxx
+++ b/tests/test-env-map.cxx
@@ -11,8 +11,13 @@
 #include <math.h>
 
 #include <simgear/compiler.h>
-
-#include SG_GLUT_H
+#if defined( __APPLE__)
+# include <OpenGL/OpenGL.h>
+# include <GLUT/glut.h>
+#else
+# include <GL/gl.h>
+# include <GL/glut.h>
+#endif
 
 #define TEXRES_X 256
 #define TEXRES_Y 256

diff --git a/utils/Modeller/normalmap.cxx b/utils/Modeller/normalmap.cxx
index f5babb13d5161d40bab7fc79e9cfc24e0d71f766..98c3a848840fdb9bd7010b2eb087e7b2afce355a 100644 (file)
--- a/utils/Modeller/normalmap.cxx
+++ b/utils/Modeller/normalmap.cxx
@@ -8,7 +8,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include SG_GL_H
+#include <osg/GL>
 
 #include <simgear/screen/texture.hxx>