diff --git a/src/AIModel/AIAircraft.cxx b/src/AIModel/AIAircraft.cxx index 7a06ba241..7d6d0d2c5 100644 --- a/src/AIModel/AIAircraft.cxx +++ b/src/AIModel/AIAircraft.cxx @@ -40,7 +40,7 @@ # include #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 f4adf16ba..d609ef92a 100644 --- a/src/AIModel/AIAircraft.hxx +++ b/src/AIModel/AIAircraft.hxx @@ -28,7 +28,7 @@ #include #include -SG_USING_STD(string); +using std::string; class PerformanceData; diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx index b6fb58a0f..2d184b015 100644 --- 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 ec55ce998..7f0284236 100644 --- a/src/AIModel/AIBase.hxx +++ b/src/AIModel/AIBase.hxx @@ -34,8 +34,8 @@ #include
-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 0e88ba452..c359c3fcb 100644 --- a/src/AIModel/AICarrier.hxx +++ b/src/AIModel/AICarrier.hxx @@ -29,8 +29,8 @@ #include -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 f4b078590..1525c6621 100644 --- 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 7b6e68101..28f0b8de6 100755 --- a/src/AIModel/AIFlightPlanCreateCruise.cxx +++ b/src/AIModel/AIFlightPlanCreateCruise.cxx @@ -31,7 +31,7 @@ #include #include -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 19303fc34..8b3582b39 100644 --- a/src/AIModel/AIManager.hxx +++ b/src/AIModel/AIManager.hxx @@ -36,7 +36,7 @@ #include #include -SG_USING_STD(list); +using std::list; class FGAIThermal; diff --git a/src/AIModel/AIStatic.cxx b/src/AIModel/AIStatic.cxx index a480e2eee..140325d42 100644 --- a/src/AIModel/AIStatic.cxx +++ b/src/AIModel/AIStatic.cxx @@ -29,7 +29,7 @@ #include #include -SG_USING_STD(string); +using std::string; #include "AIStatic.hxx" diff --git a/src/AIModel/AIStatic.hxx b/src/AIModel/AIStatic.hxx index 384ff1b18..f7ca53a39 100644 --- a/src/AIModel/AIStatic.hxx +++ b/src/AIModel/AIStatic.hxx @@ -25,7 +25,7 @@ #include "AIBase.hxx" #include -SG_USING_STD(string); +using std::string; class FGAIStatic : public FGAIBase { diff --git a/src/AIModel/AIStorm.cxx b/src/AIModel/AIStorm.cxx index 2a99b2c31..3220cc773 100644 --- a/src/AIModel/AIStorm.cxx +++ b/src/AIModel/AIStorm.cxx @@ -31,7 +31,7 @@ #include #include -SG_USING_STD(string); +using std::string; #include "AIStorm.hxx" diff --git a/src/AIModel/AIStorm.hxx b/src/AIModel/AIStorm.hxx index 3a0153fc5..f6a7e9018 100644 --- a/src/AIModel/AIStorm.hxx +++ b/src/AIModel/AIStorm.hxx @@ -25,7 +25,7 @@ #include "AIBase.hxx" #include -SG_USING_STD(string); +using std::string; class FGAIStorm : public FGAIBase { diff --git a/src/AIModel/AIThermal.cxx b/src/AIModel/AIThermal.cxx index d01421c73..0f1ee18f5 100644 --- a/src/AIModel/AIThermal.cxx +++ b/src/AIModel/AIThermal.cxx @@ -29,7 +29,7 @@ #include #include -SG_USING_STD(string); +using std::string; #include "AIThermal.hxx" diff --git a/src/AIModel/AIThermal.hxx b/src/AIModel/AIThermal.hxx index 38a50bea9..731ac81ce 100644 --- a/src/AIModel/AIThermal.hxx +++ b/src/AIModel/AIThermal.hxx @@ -25,7 +25,7 @@ #include "AIBase.hxx" #include -SG_USING_STD(string); +using std::string; class FGAIThermal : public FGAIBase { diff --git a/src/AIModel/submodel.hxx b/src/AIModel/submodel.hxx index 3f6965fcc..d054033cd 100644 --- a/src/AIModel/submodel.hxx +++ b/src/AIModel/submodel.hxx @@ -19,9 +19,9 @@ #include
-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 b4f6e1517..66c4803e7 100644 --- a/src/ATC/trafficcontrol.hxx +++ b/src/ATC/trafficcontrol.hxx @@ -35,8 +35,8 @@ #include #include -SG_USING_STD(string); -SG_USING_STD(vector); +using std::string; +using std::vector; typedef vector intVec; diff --git a/src/ATCDCL/AIGAVFRTraffic.cxx b/src/ATCDCL/AIGAVFRTraffic.cxx index 6941a2489..811002f23 100644 --- a/src/ATCDCL/AIGAVFRTraffic.cxx +++ b/src/ATCDCL/AIGAVFRTraffic.cxx @@ -29,7 +29,7 @@ #include #include -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 9aabd8746..771aa8f9d 100644 --- a/src/ATCDCL/AIGAVFRTraffic.hxx +++ b/src/ATCDCL/AIGAVFRTraffic.hxx @@ -28,7 +28,7 @@ #include "AILocalTraffic.hxx" #include -SG_USING_STD(string); +using std::string; class FGAIGAVFRTraffic : public FGAILocalTraffic { diff --git a/src/ATCDCL/AILocalTraffic.cxx b/src/ATCDCL/AILocalTraffic.cxx index 15eb6a3d3..2afd62ea9 100644 --- a/src/ATCDCL/AILocalTraffic.cxx +++ b/src/ATCDCL/AILocalTraffic.cxx @@ -47,7 +47,7 @@ during descent to avoid occasionally landing short or long. #include #include -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 a4e1505f6..e2fb7ee6c 100644 --- a/src/ATCDCL/AILocalTraffic.hxx +++ b/src/ATCDCL/AILocalTraffic.hxx @@ -34,7 +34,7 @@ class FGTower; struct Gate; #include -SG_USING_STD(string); +using std::string; enum TaxiState { TD_INBOUND, diff --git a/src/ATCDCL/AIMgr.cxx b/src/ATCDCL/AIMgr.cxx index 23d44bbf1..c8f7b8b02 100644 --- 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 6bc81a10b..d08d6f566 100644 --- 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 84006294d..5352c1c47 100644 --- a/src/ATCDCL/AIPlane.cxx +++ b/src/ATCDCL/AIPlane.cxx @@ -25,7 +25,7 @@ #include #include #include -SG_USING_STD(string); +using std::string; #include "AIPlane.hxx" diff --git a/src/ATCDCL/ATC.hxx b/src/ATCDCL/ATC.hxx index 1f73b5bef..ecc9f5f60 100644 --- 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 2946478da..80d7edce0 100644 --- a/src/ATCDCL/ATCDialog.cxx +++ b/src/ATCDCL/ATCDialog.cxx @@ -39,7 +39,7 @@ #include -SG_USING_STD(ostringstream); +using std::ostringstream; FGATCDialog *current_atcdialog; diff --git a/src/ATCDCL/ATCDialog.hxx b/src/ATCDCL/ATCDialog.hxx index 76cf2cc9f..ea393c907 100644 --- 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 3185cc023..bdd2b0a49 100644 --- a/src/ATCDCL/ATCVoice.hxx +++ b/src/ATCDCL/ATCVoice.hxx @@ -30,9 +30,9 @@ #include -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 9e8e1f837..9ac6a75d9 100644 --- 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 80b155e08..b5248b84a 100644 --- a/src/ATCDCL/ATCutils.hxx +++ b/src/ATCDCL/ATCutils.hxx @@ -24,7 +24,7 @@ #include #include #include -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 d7209a141..30a7f5af7 100644 --- a/src/ATCDCL/atis.cxx +++ b/src/ATCDCL/atis.cxx @@ -29,10 +29,10 @@ #include // atoi() #include // sprintf #include -SG_USING_STD(string); +using std::string; #include -SG_USING_STD(cout); +using std::cout; #include diff --git a/src/ATCDCL/commlist.hxx b/src/ATCDCL/commlist.hxx index 1cb2f4855..e253e6e98 100644 --- 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 5176f1392..e1909885c 100644 --- 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 fccaaaba1..e61109bfb 100644 --- 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 ae6be8a8b..ac1c76025 100644 --- 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 1891d4221..0e599c1a4 100644 --- a/src/Aircraft/replay.hxx +++ b/src/Aircraft/replay.hxx @@ -39,7 +39,7 @@ #include #include -SG_USING_STD(deque); +using std::deque; class FGReplayData { diff --git a/src/Airports/apt_loader.hxx b/src/Airports/apt_loader.hxx index e96bde6a4..ea13216a5 100644 --- a/src/Airports/apt_loader.hxx +++ b/src/Airports/apt_loader.hxx @@ -34,7 +34,7 @@ #include -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 4974f0af2..3ca71bef3 100644 --- a/src/Airports/calc_loc.cxx +++ b/src/Airports/calc_loc.cxx @@ -17,9 +17,9 @@ #include -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 868c45cea..39c305cca 100644 --- a/src/Airports/dynamics.cxx +++ b/src/Airports/dynamics.cxx @@ -43,10 +43,10 @@ #include #include -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 d82ae28fb..b7b21b040 100644 --- a/src/Airports/gnnode.cxx +++ b/src/Airports/gnnode.cxx @@ -2,7 +2,7 @@ #include "groundnetwork.hxx" #include -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 9912600e6..aee5d6a81 100644 --- a/src/Airports/gnnode.hxx +++ b/src/Airports/gnnode.hxx @@ -20,8 +20,8 @@ #include #include -SG_USING_STD(string); -SG_USING_STD(vector); +using std::string; +using std::vector; class FGTaxiSegment; typedef vector FGTaxiSegmentVector; diff --git a/src/Airports/groundnetwork.hxx b/src/Airports/groundnetwork.hxx index ae9aa4d20..a70fa2c09 100644 --- a/src/Airports/groundnetwork.hxx +++ b/src/Airports/groundnetwork.hxx @@ -30,8 +30,8 @@ #include #include -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 5ff130b82..0cac08bbc 100644 --- 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 56a62eed3..f86fd327e 100644 --- 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 9b0c7485f..d3fccdcc2 100644 --- a/src/Airports/runwayprefs.hxx +++ b/src/Airports/runwayprefs.hxx @@ -30,8 +30,8 @@ #include -SG_USING_STD(vector); -SG_USING_STD(string); +using std::vector; +using std::string; typedef vector timeVec; typedef vector::const_iterator timeVecConstIterator; diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx index 726b46433..3ea0b64cf 100644 --- 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 6dcf4e76d..532c777cf 100644 --- a/src/Airports/runways.hxx +++ b/src/Airports/runways.hxx @@ -39,8 +39,8 @@ #include #include -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 5c9330bd5..018b44cea 100644 --- 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 0b562424c..78a53e750 100644 --- 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 4b25c4e09..67a27d7c8 100644 --- a/src/Autopilot/route_mgr.hxx +++ b/src/Autopilot/route_mgr.hxx @@ -37,8 +37,8 @@ #include #include -SG_USING_STD(string); -SG_USING_STD(vector); +using std::string; +using std::vector; #include #include diff --git a/src/Autopilot/xmlauto.hxx b/src/Autopilot/xmlauto.hxx index ad206b5a2..07d5dd7ce 100644 --- a/src/Autopilot/xmlauto.hxx +++ b/src/Autopilot/xmlauto.hxx @@ -38,9 +38,9 @@ #include #include -SG_USING_STD(string); -SG_USING_STD(vector); -SG_USING_STD(deque); +using std::string; +using std::vector; +using std::deque; #include #include diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx index 1cd14b960..617909b2a 100644 --- a/src/Cockpit/hud.cxx +++ b/src/Cockpit/hud.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include //#include @@ -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 9782e7f59..8c7d16328 100644 --- a/src/Cockpit/hud.hxx +++ b/src/Cockpit/hud.hxx @@ -65,8 +65,8 @@ namespace osg { #include -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 ed1794312..f70ed6d77 100644 --- a/src/Cockpit/hud_rwy.cxx +++ b/src/Cockpit/hud_rwy.cxx @@ -34,7 +34,7 @@ #include #include -#include SG_GLU_H +#include // 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 c63fd6527..a940df8c3 100644 --- a/src/Cockpit/panel.cxx +++ b/src/Cockpit/panel.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include
#include
@@ -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 0b9f71906..58c1eed4a 100644 --- a/src/Cockpit/panel.hxx +++ b/src/Cockpit/panel.hxx @@ -50,8 +50,8 @@ #include #include -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 418267f23..dd1f10361 100644 --- 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; diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx index 66bb8e484..79f4a870b 100644 --- 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 fb042a152..d06a7d108 100644 --- a/src/Environment/environment_ctrl.hxx +++ b/src/Environment/environment_ctrl.hxx @@ -40,8 +40,8 @@ #include #include -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 8a14f7f6f..71fc0ecbc 100644 --- a/src/Environment/fgclouds.hxx +++ b/src/Environment/fgclouds.hxx @@ -32,7 +32,7 @@ #include -SG_USING_STD(string); +using std::string; class SGNewCloud; class SGCloudField; diff --git a/src/Environment/fgmetar.hxx b/src/Environment/fgmetar.hxx index 7d69684f5..8a9884cc8 100644 --- a/src/Environment/fgmetar.hxx +++ b/src/Environment/fgmetar.hxx @@ -30,9 +30,9 @@ #include -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 47a2b4706..ddf196d2c 100644 --- 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 ba936320f..7021554e7 100644 --- 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 ba44df811..428abc10d 100644 --- 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 55d73d009..28b1c7b9f 100644 --- 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 25ec75624..85f30df4d 100644 --- 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 f2917ebf8..58694c3f5 100644 --- 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 e88f1ea7c..44823d066 100644 --- 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 d8cf1c8da..553d6d689 100644 --- 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 283aafdd0..c9949d0d5 100644 --- 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 4c16d6247..ba21aab2a 100644 --- 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 5592c0afb..cdd597746 100644 --- 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 9f8bcad3e..6161df2cb 100644 --- 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 8a5b5f2f0..1a0c40947 100644 --- 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 e9d2ddc3f..96ede0e36 100644 --- 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 4af9238be..a8e7c395c 100644 --- 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 a72bff72c..7b1a9de83 100644 --- 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 8fd5a94fe..e9050e81f 100644 --- 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 df16cb518..f51929e6a 100644 --- 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 c58060a2d..889ef2eb4 100644 --- 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 a0c2029c3..e956b6180 100644 --- 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 2a38efc4d..2817d24a1 100644 --- 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 5b62e146f..12701c9a8 100644 --- 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 911f3ef27..f39b8c6c0 100644 --- a/src/FDM/UIUCModel/uiuc_parsefile.h +++ b/src/FDM/UIUCModel/uiuc_parsefile.h @@ -7,10 +7,10 @@ #include #include -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 de7bd107e..cd0ca2414 100644 --- 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 ded7a067b..35ed164d4 100644 --- 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 4908f24f3..413984a81 100644 --- a/src/FDM/YASim/Rotor.cpp +++ b/src/FDM/YASim/Rotor.cpp @@ -11,7 +11,7 @@ #include #include -SG_USING_STD(setprecision); +using std::setprecision; #ifdef TEST_DEBUG #include diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx index 23eb90250..017ab0a55 100644 --- a/src/FDM/flight.hxx +++ b/src/FDM/flight.hxx @@ -84,9 +84,9 @@ #include #include -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 e272e96a9..09b76232f 100644 --- a/src/GUI/dialog.hxx +++ b/src/GUI/dialog.hxx @@ -15,7 +15,7 @@ #include #include -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 c00634089..0c7e3fed2 100644 --- a/src/GUI/layout-test.cxx +++ b/src/GUI/layout-test.cxx @@ -5,7 +5,7 @@ #include #include -#include SG_GL_H +#include #include #include #include diff --git a/src/GUI/menubar.hxx b/src/GUI/menubar.hxx index e3a97d57e..eab4b7ff8 100644 --- a/src/GUI/menubar.hxx +++ b/src/GUI/menubar.hxx @@ -13,10 +13,10 @@ #include #include -SG_USING_STD(map); +using std::map; #include -SG_USING_STD(vector); +using std::vector; class puMenuBar; diff --git a/src/GUI/new_gui.hxx b/src/GUI/new_gui.hxx index 3fb1703d2..6bc270715 100644 --- a/src/GUI/new_gui.hxx +++ b/src/GUI/new_gui.hxx @@ -22,9 +22,9 @@ #include #include -SG_USING_STD(vector); -SG_USING_STD(map); -SG_USING_STD(string); +using std::vector; +using std::map; +using std::string; #include
diff --git a/src/GUI/property_list.cxx b/src/GUI/property_list.cxx index ae709d290..2b63183ac 100644 --- a/src/GUI/property_list.cxx +++ b/src/GUI/property_list.cxx @@ -31,7 +31,7 @@ #include #include #include -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 726aabbea..6f0176b4b 100644 --- a/src/Input/fgjs.cxx +++ b/src/Input/fgjs.cxx @@ -38,12 +38,12 @@ #include #include -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 #include diff --git a/src/Input/input.cxx b/src/Input/input.cxx index 21d96e658..7197b27f9 100644 --- a/src/Input/input.cxx +++ b/src/Input/input.cxx @@ -59,10 +59,10 @@ #include #include
-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 9491685ec..e71d8620e 100644 --- a/src/Input/input.hxx +++ b/src/Input/input.hxx @@ -48,8 +48,8 @@ #include #include -SG_USING_STD(map); -SG_USING_STD(vector); +using std::map; +using std::vector; diff --git a/src/Input/jsinput.cxx b/src/Input/jsinput.cxx index 6f6a9eda4..b57f828d2 100644 --- a/src/Input/jsinput.cxx +++ b/src/Input/jsinput.cxx @@ -22,9 +22,9 @@ #include -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 a34858471..05e4d6e27 100644 --- a/src/Instrumentation/HUD/HUD.cxx +++ b/src/Instrumentation/HUD/HUD.cxx @@ -31,14 +31,13 @@ #include #include +#include #include
#include
#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 a6d95bdb3..7655a31bd 100644 --- a/src/Instrumentation/HUD/HUD.hxx +++ b/src/Instrumentation/HUD/HUD.hxx @@ -33,8 +33,8 @@ #include #include -SG_USING_STD(deque); -SG_USING_STD(vector); +using std::deque; +using std::vector; #include diff --git a/src/Instrumentation/HUD/HUD_runway.cxx b/src/Instrumentation/HUD/HUD_runway.cxx index c3dc5e19c..67d4b857d 100644 --- a/src/Instrumentation/HUD/HUD_runway.cxx +++ b/src/Instrumentation/HUD/HUD_runway.cxx @@ -26,7 +26,7 @@ #include #include #include -#include SG_GLU_H +#include #include
#include diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx index ffc59c5f9..81a9b0aeb 100644 --- a/src/Instrumentation/KLN89/kln89.cxx +++ b/src/Instrumentation/KLN89/kln89.cxx @@ -47,7 +47,7 @@ #include
#include -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 69831a6f2..0feac829d 100644 --- a/src/Instrumentation/adf.hxx +++ b/src/Instrumentation/adf.hxx @@ -19,7 +19,7 @@ #include #include -SG_USING_STD(string); +using std::string; /** diff --git a/src/Instrumentation/dclgps.cxx b/src/Instrumentation/dclgps.cxx index cafa056c1..8707ccf1e 100644 --- a/src/Instrumentation/dclgps.cxx +++ b/src/Instrumentation/dclgps.cxx @@ -29,7 +29,7 @@ #include #include
#include -SG_USING_STD(cout); +using std::cout; //using namespace std; diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx index 76b8974bf..aff76facf 100644 --- 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 c909b7cee..4749ce856 100644 --- a/src/Instrumentation/kr_87.cxx +++ b/src/Instrumentation/kr_87.cxx @@ -36,7 +36,7 @@ #include "kr_87.hxx" #include -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 35179c992..1cb91f0af 100644 --- a/src/Instrumentation/marker_beacon.cxx +++ b/src/Instrumentation/marker_beacon.cxx @@ -36,7 +36,7 @@ #include "marker_beacon.hxx" #include -SG_USING_STD(string); +using std::string; // Constructor diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx index 43cbb1e84..fc34f0b79 100755 --- a/src/Instrumentation/mk_viii.cxx +++ b/src/Instrumentation/mk_viii.cxx @@ -72,7 +72,7 @@ #include #include -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 722abddf0..bf6a2c444 100755 --- a/src/Instrumentation/mk_viii.hxx +++ b/src/Instrumentation/mk_viii.hxx @@ -32,9 +32,9 @@ #include #include -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 5e6d6585c..a208a14d6 100644 --- a/src/Instrumentation/navradio.cxx +++ b/src/Instrumentation/navradio.cxx @@ -40,7 +40,7 @@ #include "navradio.hxx" #include -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 e1155fb68..ae8784c54 100644 --- 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 de41798d0..6b4dc3230 100644 --- a/src/Instrumentation/render_area_2d.hxx +++ b/src/Instrumentation/render_area_2d.hxx @@ -33,7 +33,7 @@ #include -SG_USING_STD(vector); +using std::vector; enum RA2DDrawingType { RA2D_LINE, diff --git a/src/Instrumentation/tacan.cxx b/src/Instrumentation/tacan.cxx index 6411abff5..59066c453 100755 --- 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 613a3c243..a97a6fb73 100644 --- a/src/Instrumentation/wxradar.cxx +++ b/src/Instrumentation/wxradar.cxx @@ -46,12 +46,12 @@ #include #include -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
#include
diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx index a756d5f5c..8f3e5122a 100644 --- a/src/Instrumentation/wxradar.hxx +++ b/src/Instrumentation/wxradar.hxx @@ -36,8 +36,8 @@ #include #include #include -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 e9394211a..d0871fb0a 100644 --- a/src/Main/bootstrap.cxx +++ b/src/Main/bootstrap.cxx @@ -39,8 +39,8 @@ #include #include -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 96e7175af..ba47d0bfd 100644 --- 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; diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index 9c7eb9d99..29134738a 100644 --- 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 +#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 281614cfe..e4a254fd0 100644 --- a/src/Main/fg_init.hxx +++ b/src/Main/fg_init.hxx @@ -42,7 +42,7 @@ #include -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 d8ffefe9a..e0e2a5c24 100644 --- 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 -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 b0da8f0d9..b470aa59e 100644 --- a/src/Main/fg_io.hxx +++ b/src/Main/fg_io.hxx @@ -31,8 +31,8 @@ #include #include -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 3aec6ab7f..0ecde2c92 100644 --- a/src/Main/fg_os.cxx +++ b/src/Main/fg_os.cxx @@ -12,8 +12,11 @@ #include -#include SG_GLUT_H - +#if defined( __APPLE__) +# include +#else +# include +#endif #include #include diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx index 957cd9c3b..f4b410a70 100644 --- 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 adac42882..71ee3f554 100644 --- a/src/Main/logger.cxx +++ b/src/Main/logger.cxx @@ -8,9 +8,9 @@ #include #include -SG_USING_STD(ofstream); -SG_USING_STD(endl); -SG_USING_STD(string); +using std::ofstream; +using std::endl; +using std::string; #include diff --git a/src/Main/options.cxx b/src/Main/options.cxx index 0882528cb..a36ad671d 100644 --- 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 3ba719688..0986e91ea 100644 --- a/src/Main/util.cxx +++ b/src/Main/util.cxx @@ -25,7 +25,7 @@ #include #include -SG_USING_STD(vector); +using std::vector; #include diff --git a/src/Main/viewmgr.hxx b/src/Main/viewmgr.hxx index 1823cbbf4..f59371568 100644 --- 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 cbab40602..1ef1f1b99 100644 --- a/src/Model/acmodel.hxx +++ b/src/Model/acmodel.hxx @@ -13,8 +13,8 @@ #include #include -SG_USING_STD(string); -SG_USING_STD(vector); +using std::string; +using std::vector; #include #include diff --git a/src/Model/model_panel.cxx b/src/Model/model_panel.cxx index ea24a2fa2..4715ecf25 100644 --- 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 0b82d3313..2ee67051a 100644 --- a/src/Model/model_panel.hxx +++ b/src/Model/model_panel.hxx @@ -12,7 +12,7 @@ #include -SG_USING_STD(vector); +using std::vector; #include #include diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx index a7f543f1e..2b547cf02 100644 --- 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 b26bc05e3..0b1cf5343 100644 --- a/src/Model/modelmgr.hxx +++ b/src/Model/modelmgr.hxx @@ -15,7 +15,7 @@ #include // for SG_USING_STD #include -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 8413da54c..84448b866 100644 --- a/src/Model/panelnode.cxx +++ b/src/Model/panelnode.cxx @@ -13,7 +13,7 @@ #include #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 45f1c740a..61cd2c49c 100644 --- a/src/MultiPlayer/multiplaymgr.hxx +++ b/src/MultiPlayer/multiplaymgr.hxx @@ -38,9 +38,9 @@ #endif #include -SG_USING_STD(string); +using std::string; #include -SG_USING_STD(vector); +using std::vector; #include #include diff --git a/src/Navaids/awynet.cxx b/src/Navaids/awynet.cxx index b3bf303fc..b2865b4e1 100755 --- 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 8a4925e08..c5451be57 100644 --- a/src/Navaids/fix.hxx +++ b/src/Navaids/fix.hxx @@ -36,8 +36,8 @@ #include -// 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 980949c9a..36bdf420d 100644 --- a/src/Navaids/fixlist.cxx +++ b/src/Navaids/fixlist.cxx @@ -30,7 +30,7 @@ #include #include "fixlist.hxx" -SG_USING_STD(pair); +using std::pair; // Constructor diff --git a/src/Navaids/fixlist.hxx b/src/Navaids/fixlist.hxx index 91d0c539b..cf81e8ce2 100644 --- 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 7c477792c..825fa1e62 100644 --- 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 ceab1d68b..b975f95b0 100644 --- 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 f90e89129..378f215c8 100644 --- 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 719e173d2..962996d62 100644 --- 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 eaab9f9c9..79a9dcb26 100644 --- 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 bb1fe9917..02c0fcb0d 100644 --- 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 5af40b5b8..c91355afd 100644 --- 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 8f02414e1..60f2420b6 100644 --- 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 d7db8cf68..b2d0df18e 100644 --- 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 9991b9089..7332284b8 100644 --- 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 0a2f7485a..818081e1b 100644 --- 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 8ef2c4357..208a6a71b 100644 --- a/src/Network/jpg-httpd.cxx +++ b/src/Network/jpg-httpd.cxx @@ -54,7 +54,7 @@ #include extern osg::ref_ptr sceneView; -SG_USING_STD(string); +using std::string; bool FGJpegHttpd::open() { diff --git a/src/Network/jsclient.hxx b/src/Network/jsclient.hxx index 1e1d3274d..a25c623e9 100644 --- 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 e8e6adbb9..ea6768992 100644 --- a/src/Network/lfsglass.cxx +++ b/src/Network/lfsglass.cxx @@ -41,7 +41,7 @@ #include
#include
-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 68072ae22..44af02ad5 100644 --- 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 db92b7580..0d5563c0e 100644 --- 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 a3ae1ea12..262ca2492 100644 --- 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 bc57e58ac..fe90e79d9 100644 --- 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 55acfb693..0549b7014 100644 --- 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 0bf49161b..2babd221c 100644 --- a/src/Network/opengc.cxx +++ b/src/Network/opengc.cxx @@ -42,7 +42,7 @@ #include
#include
-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 ec1a924e2..fb5f3a92e 100644 --- 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 35bf73488..bb661aed1 100644 --- a/src/Network/props.hxx +++ b/src/Network/props.hxx @@ -30,8 +30,8 @@ #include #include -SG_USING_STD(string); -SG_USING_STD(vector); +using std::string; +using std::vector; #include diff --git a/src/Network/protocol.hxx b/src/Network/protocol.hxx index 5472e4a6a..03cf8357d 100644 --- a/src/Network/protocol.hxx +++ b/src/Network/protocol.hxx @@ -31,8 +31,8 @@ #include #include -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 -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 bf79e3acd..929e9e1a3 100644 --- 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 0de5bd35a..d304c408f 100644 --- 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 f628da370..b19b9556d 100644 --- 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 d1bf0a4c8..8c57159c4 100644 --- a/src/Scripting/NasalSys.hxx +++ b/src/Scripting/NasalSys.hxx @@ -8,7 +8,7 @@ #include #include -SG_USING_STD(map); +using std::map; class FGNasalScript; diff --git a/src/Sound/fg_fx.hxx b/src/Sound/fg_fx.hxx index 0fd4a2ff2..882280680 100644 --- a/src/Sound/fg_fx.hxx +++ b/src/Sound/fg_fx.hxx @@ -32,8 +32,8 @@ #include #include -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 117ee3aad..39dae579a 100644 --- a/src/Sound/voice.hxx +++ b/src/Sound/voice.hxx @@ -44,10 +44,10 @@ # include #else # include - 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 1e660e471..a9e85039b 100644 --- a/src/Systems/electrical.hxx +++ b/src/Systems/electrical.hxx @@ -35,8 +35,8 @@ #include #include -SG_USING_STD(string); -SG_USING_STD(vector); +using std::string; +using std::vector; #include #include diff --git a/src/Systems/pitot.hxx b/src/Systems/pitot.hxx index 4c4677961..9d97dee40 100644 --- a/src/Systems/pitot.hxx +++ b/src/Systems/pitot.hxx @@ -14,7 +14,7 @@ #include #include -SG_USING_STD(string); +using std::string; #include #include diff --git a/src/Traffic/SchedFlight.hxx b/src/Traffic/SchedFlight.hxx index 4f85ed993..63ba6c7fd 100644 --- 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 80402487d..3a8eb5513 100644 --- 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 3b0efaf80..5ff0a8aca 100644 --- a/tests/est-epsilon.c +++ b/tests/est-epsilon.c @@ -9,9 +9,11 @@ #include #include - -#include SG_GLUT_H - +#if defined( __APPLE__) +# include +#else +# include +#endif int main() { GLfloat a, t; diff --git a/tests/gl-info.c b/tests/gl-info.c index 4aff41db6..7d56fe811 100644 --- a/tests/gl-info.c +++ b/tests/gl-info.c @@ -19,8 +19,13 @@ Date: Fri, 24 Apr 1998 07:33:51 -0800 #include #include - -#include SG_GLUT_H +#if defined( __APPLE__) +# include +# include +#else +# include +# include +#endif void getPrints ( GLenum token, char *string ) diff --git a/tests/test-env-map.cxx b/tests/test-env-map.cxx index 6d369efc6..c3377bb33 100644 --- a/tests/test-env-map.cxx +++ b/tests/test-env-map.cxx @@ -11,8 +11,13 @@ #include #include - -#include SG_GLUT_H +#if defined( __APPLE__) +# include +# include +#else +# include +# include +#endif #define TEXRES_X 256 #define TEXRES_Y 256 diff --git a/utils/Modeller/normalmap.cxx b/utils/Modeller/normalmap.cxx index f5babb13d..98c3a8488 100644 --- a/utils/Modeller/normalmap.cxx +++ b/utils/Modeller/normalmap.cxx @@ -8,7 +8,7 @@ #include #include -#include SG_GL_H +#include #include