]> git.mxchange.org Git - flightgear.git/commitdiff
This should apply, and everything should build cleanly, in isolation from the
authorehofman <ehofman>
Fri, 25 Jul 2008 18:38:29 +0000 (18:38 +0000)
committerehofman <ehofman>
Fri, 25 Jul 2008 18:38:29 +0000 (18:38 +0000)
SimGear change. It changes all the SG_xxxx to be the 'real' includes, and gets
rid of many #ifdef SG_HAVE_STD_INCLUDES. As an added bonus, rather than
replacing 'SG_USING_NAMESPACE(std)' with 'using namespace std', I just fixed
the small number of places to use std:: explicitly. So we're no longer polluting
the global namespace with the entire contents of std, in many cases.

There is one more 'mechanical' change to come - getting rid of SG_USING_STD(X),
but I want to keep that separate from everything else. (There's another
mechnical change, replacing <math.h> with <cmath> and so on *everywhere*, but
one step at a time)

128 files changed:
configure.ac
src/AIModel/AIBase.cxx
src/ATC/trafficcontrol.hxx
src/ATCDCL/ATC.hxx
src/ATCDCL/atis.cxx
src/ATCDCL/ground.cxx
src/ATCDCL/ground.hxx
src/ATCDCL/tower.hxx
src/Airports/apt_loader.cxx
src/Airports/apt_loader.hxx
src/Airports/calc_loc.cxx
src/Airports/dynamics.cxx
src/Airports/groundnetwork.cxx
src/Airports/groundnetwork.hxx
src/Airports/parking.cxx
src/Airports/parking.hxx
src/Airports/runways.cxx
src/Airports/runways.hxx
src/Airports/simple.cxx
src/Airports/simple.hxx
src/Autopilot/route_mgr.hxx
src/Autopilot/xmlauto.hxx
src/Cockpit/hud.cxx
src/Cockpit/hud.hxx
src/Cockpit/panel_io.cxx
src/Cockpit/panel_io.hxx
src/Environment/atmosphere.hxx
src/Environment/environment.hxx
src/Environment/environment_ctrl.hxx
src/Environment/fgclouds.hxx
src/FDM/Balloon.h [deleted file]
src/FDM/Balloon/.cvsignore [deleted file]
src/FDM/Balloon/BalloonSim.cpp [deleted file]
src/FDM/Balloon/BalloonSim.h [deleted file]
src/FDM/Balloon/Makefile.am [deleted file]
src/FDM/JSBSim/JSBSim.cxx
src/FDM/LaRCsim/IO360.cxx
src/FDM/LaRCsim/LaRCsimIC.cxx
src/FDM/MagicCarpet.cxx [deleted file]
src/FDM/MagicCarpet.hxx [deleted file]
src/FDM/Makefile.am
src/FDM/SP/Makefile.am
src/FDM/UIUCModel/uiuc_controlInput.cpp
src/FDM/UIUCModel/uiuc_menu.cpp
src/FDM/UIUCModel/uiuc_menu_CD.cpp
src/FDM/UIUCModel/uiuc_menu_CL.cpp
src/FDM/UIUCModel/uiuc_menu_CY.cpp
src/FDM/UIUCModel/uiuc_menu_Cm.cpp
src/FDM/UIUCModel/uiuc_menu_Cn.cpp
src/FDM/UIUCModel/uiuc_menu_Croll.cpp
src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp
src/FDM/UIUCModel/uiuc_menu_engine.cpp
src/FDM/UIUCModel/uiuc_menu_fog.cpp
src/FDM/UIUCModel/uiuc_menu_gear.cpp
src/FDM/UIUCModel/uiuc_menu_geometry.cpp
src/FDM/UIUCModel/uiuc_menu_ice.cpp
src/FDM/UIUCModel/uiuc_menu_init.cpp
src/FDM/UIUCModel/uiuc_menu_mass.cpp
src/FDM/UIUCModel/uiuc_menu_misc.cpp
src/FDM/UIUCModel/uiuc_menu_record.cpp
src/FDM/UIUCModel/uiuc_parsefile.h
src/FDM/YASim/Rotor.cpp
src/GUI/gui_funcs.cxx
src/GUI/mouse.cxx
src/GUI/property_list.cxx
src/Input/fgjs.cxx
src/Input/input.cxx
src/Input/jsinput.cxx
src/Instrumentation/HUD/HUD.cxx
src/Instrumentation/HUD/HUD.hxx
src/Instrumentation/attitude_indicator.cxx
src/Instrumentation/heading_indicator.cxx
src/Instrumentation/heading_indicator_dg.cxx
src/Instrumentation/heading_indicator_fg.cxx
src/Instrumentation/mrg.cxx
src/Instrumentation/turn_indicator.cxx
src/Main/bootstrap.cxx
src/Main/fg_commands.cxx
src/Main/fg_init.cxx
src/Main/fg_init.hxx
src/Main/fg_io.cxx
src/Main/fg_io.hxx
src/Main/fg_os_common.cxx
src/Main/fg_props.cxx
src/Main/globals.hxx
src/Main/logger.cxx
src/Main/options.cxx
src/MultiPlayer/multiplaymgr.hxx
src/Navaids/awynet.hxx
src/Navaids/fix.hxx
src/Navaids/fixlist.hxx
src/Navaids/navdb.cxx
src/Navaids/navdb.hxx
src/Navaids/navlist.hxx
src/Navaids/navrecord.hxx
src/Network/ATC-Inputs.cxx
src/Network/ATC-Main.cxx
src/Network/ATC-Outputs.cxx
src/Network/AV400.cxx
src/Network/AV400.hxx
src/Network/atlas.hxx
src/Network/garmin.cxx
src/Network/garmin.hxx
src/Network/generic.hxx
src/Network/httpd.cxx
src/Network/joyclient.hxx
src/Network/jpg-httpd.cxx
src/Network/jsclient.hxx
src/Network/lfsglass.hxx
src/Network/multiplay.cxx
src/Network/multiplay.hxx
src/Network/native.hxx
src/Network/native_ctrls.hxx
src/Network/nmea.cxx
src/Network/nmea.hxx
src/Network/opengc.hxx
src/Network/props.hxx
src/Network/protocol.hxx
src/Network/pve.hxx
src/Network/ray.hxx
src/Network/rul.hxx
src/Systems/electrical.hxx
src/Systems/pitot.hxx
src/Time/light.cxx
src/Time/sunsolver.cxx
src/Time/sunsolver.hxx
tests/test-up.cxx
utils/TerraSync/terrasync.cxx

index 24e6c9f524da65bbba175c2d5f01abd2cdab859d..dde173e0818935b3c634ed037be1c4c53f462afb 100644 (file)
@@ -652,7 +652,6 @@ AC_CONFIG_FILES([ \
        src/Cockpit/Makefile \
        src/Cockpit/built_in/Makefile \
        src/Environment/Makefile \
-       src/FDM/Balloon/Makefile \
        src/FDM/ExternalNet/Makefile \
        src/FDM/ExternalPipe/Makefile \
        src/FDM/JSBSim/Makefile \
index 391cc577b04d4ba3974cb487492ecfa5c1294108..69c69d8902403de9d6524c8e7f0ae868b7bfafae 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <osg/ref_ptr>
 #include <osg/Node>
index f2e63eff45151fcf565ca3b6570c6761f6bf4dde..b4f6e1517552e4c01c8982ba6ffbc3637752c934 100644 (file)
@@ -32,7 +32,7 @@
 
 
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(string);
index 1889a86c2b5526a8653d0ac529ecdc1a02ff4e45..1f73b5bef20b88860098aaa12b160a99489bbd79 100644 (file)
@@ -31,7 +31,7 @@
 #include <istream>
 #include <ostream>
 
-#include STL_STRING
+#include <string>
 
 #include "ATCVoice.hxx"
 
index 0957d18ac002b1088c4bcee5d6e1895149fc16cd..d7209a14122d29baa47b3e2090adf4edbab11e53 100644 (file)
@@ -31,7 +31,7 @@
 #include <string>
 SG_USING_STD(string);
 
-#include STL_IOSTREAM
+#include <iostream>
 SG_USING_STD(cout);
 
 #include <simgear/misc/sg_path.hxx>
index 4adfa9958c821c83c51f6b54467f2773b573cb0c..5176f13924d2b5b319525191516c3fc262131e12 100644 (file)
@@ -30,7 +30,7 @@
 #include <Main/globals.hxx>
 
 #include <stdlib.h>
-#include STL_FSTREAM
+#include <fstream>
 
 #include "ground.hxx"
 #include "ATCutils.hxx"
index de8348b87a7eec4bb836803cfb1cef1d467034c0..a94e3f252c233a90ab332c293efefc84905f28da 100644 (file)
@@ -33,7 +33,7 @@
 #include "ATC.hxx"
 #include "ATCProjection.hxx"
 
-#include STL_STRING
+#include <string>
 
 class FGAIEntity;
 class FGATCMgr;
index ad1c2ba17d4d4893602f17e88795024e4f64d9a2..2a4b5afc4b32c876c5f39cc7a704fbd8c87e3029 100644 (file)
@@ -27,7 +27,7 @@
 #include <plib/sg.h>
 
 #include <iosfwd>
-#include STL_STRING
+#include <string>
 
 #include "ATC.hxx"
 #include "ATCProjection.hxx"
index a34bed5bb3b94f1191f25609af1ec010a62c5ee1..896be4ea1b4b737cad102182d3dc698e1f89c688 100644 (file)
@@ -37,7 +37,7 @@
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/strutils.hxx>
 
-#include STL_STRING
+#include <string>
 
 #include "simple.hxx"
 #include "runways.hxx"
index 1acbde492f3bfe3b57ec93044bad2aef57ee0223..e96bde6a4958b0d7a8d78999b0488607ad8ea091 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 SG_USING_STD(string);
 
index c94fa3a16a0137373c2b15b2f8cfe31d854751e4..4974f0af2d35a12f3f5b1cdea6295c8334456159 100644 (file)
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include <iostream>
-#include STL_STRING
+#include <string>
 
 #include <plib/sg.h>
 
index 4cb904abf4f782589400e7cc5be9fa53ba128a74..868c45cea171ed7e596bdc622f5f5def44dd7fbe 100644 (file)
@@ -40,7 +40,7 @@
 #include <Main/fg_props.hxx>
 #include <Airports/runways.hxx>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(string);
index 1f2f0fcab452c61419303efd0872a027a8f3349d..a4cefee0dab9a7c45a52edac952068b5f03c5f16 100644 (file)
@@ -43,7 +43,7 @@
 
 #include <AIModel/AIFlightPlan.hxx>
 
-//#include STL_STRING
+//#include <string>
 
 #include "groundnetwork.hxx"
 
index 33adb7a138b76610910fdc3ad6d5a80a2d9332af..ae9aa4d207a79aa3de3065cc359b1b167e427f66 100644 (file)
@@ -27,7 +27,7 @@
 #include <simgear/compiler.h>
 #include <simgear/route/waypoint.hxx>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(string);
index ce3181fa496ba64162be75203e63a57d60e1bfc9..525241d5917a45ce51282c7865b7d040835cc248 100644 (file)
@@ -43,7 +43,7 @@
 //#include <Main/fg_props.hxx>
 //#include <Airports/runways.hxx>
 
-#include STL_STRING
+#include <string>
 
 #include "parking.hxx"
 #include "groundnetwork.hxx"
index 908acf0294b3e597d458323dda0b1f3234ee80d5..5ff130b82124ff19ee7871ead09d435eb9367195 100644 (file)
@@ -31,7 +31,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 #include "gnnode.hxx"
index c1b22452259df4cf70eeb705d176bbb1ea90f505..726b46433ddb7ff8a1a6f3666587d115e1b04f4b 100644 (file)
 #include <simgear/debug/logstream.hxx>
 #include <Main/fg_props.hxx>
 
-#include STL_STRING
+#include <string>
 #include <map>
 
 #include "runways.hxx"
 
-SG_USING_NAMESPACE(std);
 SG_USING_STD(istream);
 SG_USING_STD(multimap);
 
index 2dcc796551c1df3cbce178bc6190c720bab0cef4..6dcf4e76d9370a9d04178551fdaf49102d54103d 100644 (file)
@@ -36,7 +36,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <map>
 
 SG_USING_STD(string);
index 486ad5fbc6999799acad6c2d725e5957c50fd79a..5c9330bd59142762e635a6daaff86973a5201d50 100644 (file)
@@ -47,7 +47,7 @@
 #include <Main/fg_props.hxx>
 #include <Airports/runways.hxx>
 
-#include STL_STRING
+#include <string>
 
 #include "simple.hxx"
 #include "xmlloader.hxx"
index 6d9aceefe2254720da4e79b73410f50abbe0112f..0b562424c0dcc9acfc7453487b32b032c2090437 100644 (file)
@@ -40,7 +40,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <map>
 #include <set>
 #include <vector>
index 0c02c2cdc08462019d1619c3612881c6acb59b29..4b25c4e09556d0847073accd00cf198607b344da 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(string);
index b325302790dcb0d381f089d6cde10a0bc952286d..ad206b5a27ef05aaea1d0dc70da0470e244954a4 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 #include <deque>
 
index 703dbbc5f935cd81de445f12165e0289fc1fc433..ad5165959193f37c09bb51f3c84c204ae16e3d13 100644 (file)
@@ -23,8 +23,8 @@
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
 
-#include STL_STRING
-#include STL_FSTREAM
+#include <string>
+#include <fstream>
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
index 0977acb2d933169edceb02721467b290175c719c..0e33f411a8a40d0a6dc595b7863e7017fa79be00 100644 (file)
@@ -48,7 +48,7 @@
 #include <algorithm>    // for_each()
 #include <vector>       // STL vector
 #include <deque>        // STL double ended queue
-#include STL_FSTREAM
+#include <fstream>
 
 #include <osg/State>
 
@@ -69,7 +69,6 @@
 
 SG_USING_STD(deque);
 SG_USING_STD(vector);
-SG_USING_NAMESPACE(std);
 
 #define float_to_int(v) SGMiscf::roundToInt(v)
 
index 9461544de506df156fed11e715e0c240b19035c4..37b383ed932eea3f0a4cca0cde4f34719b4840f9 100644 (file)
@@ -35,8 +35,8 @@
 #include <simgear/props/props.hxx>
 
 #include <istream>
-#include STL_FSTREAM
-#include STL_STRING
+#include <fstream>
+#include <string>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
index 3f604828d4e78e0f76be4f13f8661cf749370fe2..0cb6df674b73c8666fad387d6abd6ff5fd84c88f 100644 (file)
@@ -32,7 +32,7 @@
 #include <simgear/compiler.h>
 
 #include <iosfwd>
-#include STL_STRING
+#include <string>
 
 class FGPanel;
 
index 68e64202de3e335dedde12a11f553ae7aa62fe4a..12df63327207cc2ebc314de0b75cfaa56c3cd36d 100644 (file)
 #include <simgear/compiler.h>
 #include <simgear/math/interpolater.hxx>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
+#include <cmath>
 
 using namespace std;
 
index c3794f901c87ad1600a80584be6347b071d6c894..c952141bd07fef99c672bd34ca2afcf1bbe2f4db 100644 (file)
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
-
+#include <cmath>
 
 /**
  * Model the natural environment.
index ace7af410f6030cc614a2ee261e44859bf5cab96..fb042a1523df0cec7a4021debe3219fa3610da7d 100644 (file)
 # include <simgear/threads/SGQueue.hxx>
 #endif
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
-
+#include <cmath>
 #include <queue>
 #include <vector>
 
index fd2a45a9cd25a65a7dad3ecf2087a244eecea9a6..8a14f7f6ff023556c2b09063cb7db69aa695e651 100644 (file)
@@ -30,7 +30,7 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <Main/fg_props.hxx>
 
-#include STL_STRING
+#include <string>
 
 SG_USING_STD(string);
 
diff --git a/src/FDM/Balloon.h b/src/FDM/Balloon.h
deleted file mode 100644 (file)
index 02bef16..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************
-
- Header:       BalloonSimInterface.h   
- Author:       Christian Mayer
- Date started: 07.10.99
-
- -------- Copyright (C) 1999 Christian Mayer (fgfs@christianmayer.de) --------
-
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
- Further information about the GNU General Public License can also be found on
- the world wide web at http://www.gnu.org.
-
-FUNCTIONAL DESCRIPTION
-------------------------------------------------------------------------------
-interface to the the hot air balloon simulator
-
-HISTORY
-------------------------------------------------------------------------------
-07.10.1999 Christian Mayer     Created
-*****************************************************************************/
-
-/****************************************************************************/
-/* SENTRY                                                                   */
-/****************************************************************************/
-#ifndef BalloonSimInterface_H
-#define BalloonSimInterface_H
-
-/****************************************************************************/
-/* INCLUDES                                                                */
-/****************************************************************************/
-#include <FDM/Balloon/BalloonSim.h>
-
-#include <Aircraft/aircraft.hxx>
-
-#include "flight.hxx"
-               
-/****************************************************************************/
-/* DEFINES                                                                 */
-/****************************************************************************/
-
-/****************************************************************************/
-/* DECLARATIONS                                                            */
-/****************************************************************************/
-
-
-class FGBalloonSim: public FGInterface {
-
-    balloon current_balloon;
-
-public:
-
-    FGBalloonSim( double dt );
-    ~FGBalloonSim();
-
-    // copy FDM state to BalloonSim structures
-    bool copy_to_BalloonSim();
-
-    // copy FDM state from BalloonSim structures
-    bool copy_from_BalloonSim();
-
-    // reset flight params to a specific position 
-    void init();
-
-    // update position based on inputs, positions, velocities, etc.
-    void update( double dt );
-};
-
-
-/****************************************************************************/
-#endif /*BalloonSimInterface_H*/
-
-
-
-
diff --git a/src/FDM/Balloon/.cvsignore b/src/FDM/Balloon/.cvsignore
deleted file mode 100644 (file)
index e995588..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/src/FDM/Balloon/BalloonSim.cpp b/src/FDM/Balloon/BalloonSim.cpp
deleted file mode 100644 (file)
index a966d6c..0000000
+++ /dev/null
@@ -1,345 +0,0 @@
-/*****************************************************************************
-
- Module:       BalloonSim.cpp
- Author:       Christian Mayer
- Date started: 01.09.99
- Called by:
-
- -------- Copyright (C) 1999 Christian Mayer (fgfs@christianmayer.de) --------
-
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
- Further information about the GNU General Public License can also be found on
- the world wide web at http://www.gnu.org.
-
-FUNCTIONAL DESCRIPTION
-------------------------------------------------------------------------------
-A hot air balloon simulator
-
-HISTORY
-------------------------------------------------------------------------------
-01.09.1999 Christian Mayer     Created
-03.10.1999 Christian Mayer     cleaned  the code  by moveing  WeatherDatabase 
-                               calls inside the update()
-*****************************************************************************/
-
-/****************************************************************************/
-/* INCLUDES                                                                */
-/****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <stdio.h>
-// #include <conio.h>
-#include <math.h>
-
-#include <simgear/constants.h>
-
-#include <Aircraft/aircraft.hxx>
-
-#include "BalloonSim.h"
-
-#include <plib/sg.h>
-
-/****************************************************************************/
-/********************************** CODE ************************************/
-/****************************************************************************/
-
-/****************************************************************************/
-/*                                                                         */
-/*  Constructor:                                                           */
-/*  Set the balloon model to some values that seem reasonable as I haven't  */
-/*  got much original values                                               */
-/*                                                                         */
-/****************************************************************************/
-balloon::balloon()
-{
-    dt = 0.1;
-    ground_level = 3400.0;
-
-    sgSetVec3(gravity_vector, 0.0, 0.0, -9.81);
-    sgSetVec3(velocity, 0.0, 0.0, 0.0);
-    sgSetVec3(position, 0.0, 0.0, 0.0);
-    sgSetVec3(hpr,     0.0, 0.0, 0.0);
-
-    /************************************************************************/
-    /* My balloon  has a  radius of  8.8 metres  as that  gives a  envelope */
-    /* volume of about 2854 m^3  which is  about 77000 ft^3,  a very common */
-    /* size for hot air balloons                                           */
-    /************************************************************************/
-
-    balloon_envelope_area = 4.0 * (8.8 * 8.8) * SGD_PI; 
-    balloon_envelope_volume = (4.0/3.0) * (8.8 * 8.8 * 8.8) * SGD_PI;
-
-    wind_facing_area_of_balloon = SGD_PI * (8.8 * 8.8);
-    wind_facing_area_of_basket = 2.0;  //guessed: 2 m^2
-    
-    cw_envelope=0.45;                  //a sphere in this case
-    cw_basket=0.8;
-
-    weight_of_total_fuel = 40.0;       //big guess
-    weight_of_envelope = 200.0;                //big guess
-    weight_of_basket = 40.0;           //big guess
-    weight_of_cargo = 750.0;           //big guess
-
-    fuel_left=1.0;
-    max_flow_of_fuel_per_second=10.0*1.0/3600.0; //assuming 10% of one hour of total burn time
-    current_burner_strength = 0.0;     //the throttle
-
-    lambda = 0.15;                     //for plasic
-    l_of_the_envelope = 1.0/1000.0;    //the thickness of the envelope (in m): 1mm
-
-    T = 273.16 + 130.6;                        //Temperature in the envelope => still at ground level
-}
-
-void balloon::update()
-{
-    /************************************************************************/
-    /* I'm  simplifying  the  balloon by  reducing the  simulation  to  two */
-    /* points:                                                              */ 
-    /* the center of the basket (CB) and the center of the envelope (CE)    */
-    /*                                                                      */
-    /*                                 ce                                   */
-    /*                                 I                                    */
-    /*                                 I                                    */
-    /*                                 cg (=center of gravity)              */
-    /*                                 I                                    */
-    /*                                 cb                                   */
-    /*                                                                      */
-    /* On each center  are forces acting:  gravity and  wind resitance.  CE */
-    /* additionally got the lift  (=> I need to calculate the weight of the */
-    /* air inside, too)                                                            */
-    /*                                                                      */
-    /* The weight of the air  in the envelope is  dependant of the tempera- */
-    /* ture. This temperature is decreasing over the time that is dependant */
-    /* of the insulation  of the envelope  material (lambda),  the gas used */
-    /* (air) and the wind speed. For a plane surface it's for air:         */
-    /*                                                                      */
-    /*   alpha = 4.8 + 3.4*v   with v < 5.0 m/s                            */
-    /*                                                                      */
-    /* The value k that takes all of that into account is defined as:      */
-    /*                                                                      */
-    /*   1 / k = 1 / alpha1 + 1 / alpha2 + l / lambda                      */
-    /*                                                                      */
-    /* with 'l' beeing the 'length' i.e. thickness of the insulator, alpha1 */
-    /* the air inside and alpha2 the air outside of the envelope.  So our k */
-    /* is:                                                                  */
-    /*                                                                      */
-    /*    k = 1 / [1/4.8 + 1/(4.8+3.4v) + l/lambda]                        */
-    /*                                                                      */
-    /* The energy lost by this process is defined as:                      */
-    /*                                                                      */
-    /*    dQ = k * A * t * dT                                              */
-    /*                                                                      */
-    /* with Q being  the energy,  k that value  defined above,  A the total */
-    /* area of the envelope,  t the time (in hours)  and dT the temperature */
-    /* difference between the inside and the outside.                      */
-    /* To get the temperature of the air in the inside I need the formula:  */
-    /*                                                                      */
-    /*    dQ = cAir * m * dT                                               */
-    /*                                                                      */
-    /* with cAir being the specific heat capacity(?)  of air (= 1.00 kcal / */
-    /* kg * degree),  m the mass of the air and  dT the temperature change. */
-    /* As the envelope is open I'm  assuming that the  same air pressure is */
-    /* inside and  outside of  it  (practical there  should  be  a slightly */
-    /* higher air pressure  in the inside or the envelope  would collapse). */
-    /* So it's easy to calculate the density of the air inside:             */
-    /*                                                                      */
-    /*    rho = p / R * T                                                  */
-    /*                                                                      */
-    /* with p being  the pressure,  R the gas constant(?)  which is for air */
-    /* 287.14 N * m / kg * K and T the absolute temperature.               */
-    /*                                                                      */
-    /* The value returned by this function is the displacement of the CB    */
-    /************************************************************************/
-
-    /************************************************************************/
-    /* NOTE:  This is the simplified version:  I'm assuming that  the whole */
-    /* balloon consists only of the envelope.I will improove the simulation */
-    /* later, but currently was my main concern to get it going...          */
-    /************************************************************************/
-
-   // I realy don't think there is a solution for this without WeatherCM
-   // but this is a hack, and it's working -- EMH
-   double mAir = 1;
-   float Q = 0;
-
-    // gain of energy by heating:
-    if (fuel_left > 0.0)       //but only with some fuel left ;-)
-    {
-       float fuel_burning = current_burner_strength * max_flow_of_fuel_per_second * dt * weight_of_total_fuel; //in kg
-    
-       //convert to cubemetres (I'm wrongly assuming 'normal' conditions; but that's correct for my special case)
-       float cube_metres_burned = fuel_burning / 2.2;  //2.2 is the density for propane
-
-       fuel_left -= fuel_burning / weight_of_total_fuel;
-
-       // get energy through burning. 
-       Q += 22250.0 * cube_metres_burned;  //22250 for propan, 29500 would be butane and if you dare: 2580 would be hydrogen...
-    }
-
-    // calculate the new temperature in the inside:
-    T += Q / (1.00 * mAir);
-
-    //calculate the masses of the envelope and the basket
-    float mEnvelope = mAir + weight_of_envelope;
-    float mBasket   = weight_of_total_fuel*fuel_left + weight_of_basket + weight_of_cargo;
-
-    float mTotal = mEnvelope + mBasket;
-
-    //calulate the forces
-    sgVec3 fTotal, fFriction, fLift;
-
-    sgScaleVec3(fTotal, gravity_vector, mTotal);
-   
-    //sgAddVec3(fTotal, fLift);     //FIXME: uninitialized fLift 
-    //sgAddVec3(fTotal, fFriction); //FIXME: uninitialized fFriction
-    
-    //claculate acceleration: a = F / m
-    sgVec3 aTotal, vTotal, dTotal;
-
-    sgScaleVec3(aTotal, fTotal, 1.0 / mTotal);
-
-    //integrate the displacement: d = 0.5 * a * dt**2 + v * dt + d
-    sgScaleVec3(vTotal, velocity, dt); 
-    sgScaleVec3(dTotal, aTotal, 0.5*dt*dt); sgAddVec3(dTotal, vTotal);
-
-    //integrate the velocity to 'velocity': v = a * dt + v
-    sgScaleVec3(vTotal, aTotal, dt); sgAddVec3(velocity, vTotal);
-
-    /************************************************************************/
-    /* VERY WRONG STUFF: it's just here to get some results to start with   */ 
-    /************************************************************************/
-
-    // care for the ground
-    if (position[2] < (ground_level+0.001) )
-       position[2] = ground_level;
-
-    //return results
-    sgAddVec3(position, dTotal);
-
-    //cout << "BallonSim: T: " << (T-273.16) << " alt: " << position[2] << " ground: " << ground_level << " throttle: " << current_burner_strength << "\n";
-}
-
-void balloon::set_burner_strength(const float bs)
-{
-    if ((bs>=0.0) && (bs<=1.0))
-    current_burner_strength = bs;
-}
-
-void balloon::getVelocity(sgVec3 v) const
-{
-    sgCopyVec3(v, velocity);
-}
-
-void balloon::setVelocity(const sgVec3 v)
-{
-    sgCopyVec3(velocity, v);
-}
-
-void balloon::getPosition(sgVec3 v) const
-{
-    sgCopyVec3(v, position);
-}
-
-void balloon::setPosition(const sgVec3 v)
-{
-    sgCopyVec3(position, v);
-}
-
-void balloon::getHPR(sgVec3 angles) const //the balloon isn't allways exactly vertical
-{
-    sgCopyVec3(angles, hpr);
-}
-
-void balloon::setHPR(const sgVec3 angles)  //the balloon isn't allways exactly vertical
-{
-    sgCopyVec3(hpr, angles);
-}
-
-void balloon::setGroundLevel(const float altitude)
-{
-    ground_level = altitude;
-}
-
-float balloon::getTemperature(void) const
-{
-    return T;
-}
-
-float balloon::getFuelLeft(void) const
-{
-    return fuel_left;
-}
-
-/*
-void main(void)
-{
-    bool burner = true;
-    balloon bal;
-    bool exit = false;
-    sgVec3 pos={0.0, 0.0, 0.0};
-    char c;
-    float acc_dt = 0.0;
-    float alt;
-
-bool hysteresis = false; // moving up
-    for (;!exit;)
-    {
-       for (int i=0; i<100; i++)
-       {
-           bal.update(0.1); acc_dt += 0.1;
-           bal.getPosition(pos);
-           alt = pos[2];
-
-           if (alt > 3010) 
-           {
-               hysteresis = true;
-               burner = false;
-           }
-           if ((alt < 2990) && (hysteresis == true))
-           {
-               hysteresis = false;
-               burner = true;
-           }
-           if ((bal.getTemperature()-273.16)>250.0)
-               burner = false; //emergency
-       }
-
-       // toogle burner
-       c = getch();
-       if (c==' ')
-           burner=!burner;
-       //if (c=='s')
-       //    show=!show;
-
-       //printf("Position: (%f/%f/%f), dP: (%f/%f/%f), burner: ", pos[0], pos[1], pos[2], dp[0], dp[1], dp[2]);
-       printf("%f         \t%f         \t%f         \t%f\n", acc_dt/60.0, bal.getTemperature()-273.16, pos[2], bal.getFuelLeft());
-       if (burner==true)
-       {
-           //printf("on\n");
-           bal.set_burner_strength(1.0);
-       }
-       else
-       {
-           //printf("off\n");
-           bal.set_burner_strength(0.0);
-       }
-
-    }
-}
-*/
diff --git a/src/FDM/Balloon/BalloonSim.h b/src/FDM/Balloon/BalloonSim.h
deleted file mode 100644 (file)
index d424fc6..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*****************************************************************************
-
- Header:       BalloonSim.h    
- Author:       Christian Mayer
- Date started: 01.09.99
-
- -------- Copyright (C) 1999 Christian Mayer (fgfs@christianmayer.de) --------
-
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
- Further information about the GNU General Public License can also be found on
- the world wide web at http://www.gnu.org.
-
-FUNCTIONAL DESCRIPTION
-------------------------------------------------------------------------------
-Header for the hot air balloon simulator
-
-HISTORY
-------------------------------------------------------------------------------
-01.09.1999 Christian Mayer     Created
-03.10.1999 Christian Mayer     cleaned  the code  by moveing  WeatherDatabase 
-                               calls inside the update()
-*****************************************************************************/
-
-/****************************************************************************/
-/* SENTRY                                                                   */
-/****************************************************************************/
-#ifndef BalloonSim_H
-#define BalloonSim_H
-
-/****************************************************************************/
-/* INCLUDES                                                                */
-/****************************************************************************/
-#include <plib/sg.h>
-               
-/****************************************************************************/
-/* DEFINES                                                                 */
-/****************************************************************************/
-
-/****************************************************************************/
-/* CLASS DECLARATION                                                       */
-/****************************************************************************/
-class balloon
-{
-private:
-    float dt;                          //in s
-
-    sgVec3 gravity_vector;             //in m/s*s
-    sgVec3 hpr;                                //the balloon isn't allways exactly vertical (e.g. during gusts); normalized
-    sgVec3 velocity;                   //current velocity; it gets iterated at each 'update'
-    sgVec3 position;                   //current position in lat/lon/alt
-
-    float balloon_envelope_area;       //area of the envelope
-    float balloon_envelope_volume;     //volume of the envelope
-
-    float wind_facing_area_of_balloon;
-    float wind_facing_area_of_basket;
-
-    float cw_envelope;                 //wind resistance of the envelope
-    float cw_basket;                   //wind resistance of the bakset
-
-    //all weights in kg
-    float weight_of_total_fuel;
-    float weight_of_envelope;
-    float weight_of_basket;            //weight of all the unmovable stuff such as the basket, the burner and the empty tanks
-    float weight_of_cargo;             //passengers and anything left (e.g. sand bags that are thrown away to give additional lift)
-
-    float fuel_left;                   //as a percentage
-    float max_flow_of_fuel_per_second; //in percent per second 
-    float current_burner_strength;
-
-    float lambda;                      //waermeuebergangskoeffizient (heat transmission coefficent?!?) for the envelope
-    float l_of_the_envelope;           //the thickness of the envelope (in m)
-
-    float T;                           //tempereature inside the balloon
-
-    float ground_level;
-
-public:
-    balloon();                         //constructor for initializing the balloon 
-
-    void update();                     //dt = time in seconds since last call
-    void set_burner_strength(const float bs);
-
-    void getVelocity(sgVec3 v) const;
-    void setVelocity(const sgVec3 v);
-
-    void getPosition(sgVec3 v) const;
-    void setPosition(const sgVec3 v);
-
-    void getHPR(sgVec3 angles) const;   //the balloon isn't allways exactly vertical
-    void setHPR(const sgVec3 angles);   //the balloon isn't allways exactly vertical
-
-    void setGroundLevel(const float altitude);
-
-    float getTemperature(void) const;
-    float getFuelLeft(void) const;
-
-    void set_dt(const float new_dt) { dt = new_dt; }
-};
-
-/****************************************************************************/
-#endif /*BalloonSim_H*/
diff --git a/src/FDM/Balloon/Makefile.am b/src/FDM/Balloon/Makefile.am
deleted file mode 100644 (file)
index 760ff18..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-noinst_LIBRARIES = libBalloon.a
-
-libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
index 667a54b5db9e5c6a70bcf93570a5a68a933be4a2..61a51fcf3f9fc3153e29e7445d59d15cef0f8c92 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <stdio.h>    //    size_t
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
index 25359089a41ec109f04983b295c4d0dc2aa98897..3b10900903a22fa0847479aff183da77d4beed9a 100644 (file)
@@ -23,8 +23,8 @@
 
 #include <math.h>
 
-#include STL_FSTREAM
-#include STL_IOSTREAM
+#include <fstream>
+#include <iostream>
 
 #include <Main/fg_props.hxx>
 
index ec867dbf3a8c9e74a6d2c0186fbf9991f292ce9e..47a2b47063a71330c3bee00517bb8d9bc06964d2 100644 (file)
@@ -28,7 +28,7 @@
 #include <simgear/compiler.h>
 
 #include <math.h>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "ls_cockpit.h"
 #include "ls_generic.h"
diff --git a/src/FDM/MagicCarpet.cxx b/src/FDM/MagicCarpet.cxx
deleted file mode 100644 (file)
index f11573e..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-// MagicCarpet.cxx -- interface to the "Magic Carpet" flight model
-//
-// Written by Curtis Olson, started October 1999.
-//
-// Copyright (C) 1999  Curtis L. Olson  - http://www.flightgear.org/~curt
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// $Id$
-
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <simgear/math/sg_geodesy.hxx>
-#include <simgear/math/point3d.hxx>
-#include <simgear/math/polar3d.hxx>
-
-#include <Aircraft/controls.hxx>
-#include <Main/globals.hxx>
-#include <Main/fg_props.hxx>
-
-#include "MagicCarpet.hxx"
-
-
-FGMagicCarpet::FGMagicCarpet( double dt ) {
-//     set_delta_t( dt );
-}
-
-
-FGMagicCarpet::~FGMagicCarpet() {
-}
-
-
-// Initialize the Magic Carpet flight model, dt is the time increment
-// for each subsequent iteration through the EOM
-void FGMagicCarpet::init() {
-    common_init();
-}
-
-
-// Run an iteration of the EOM (equations of motion)
-void FGMagicCarpet::update( double dt ) {
-    // cout << "FGLaRCsim::update()" << endl;
-
-    if (is_suspended())
-      return;
-
-    // int multiloop = _calc_multiloop(dt);
-
-    double time_step = dt;
-
-    // speed and distance traveled
-    double speed = globals->get_controls()->get_throttle( 0 ) * 2000; // meters/sec
-    if ( globals->get_controls()->get_brake_left() > 0.0
-         || globals->get_controls()->get_brake_right() > 0.0 )
-    {
-        speed = -speed;
-    }
-
-    double dist = speed * time_step;
-    double kts = speed * SG_METER_TO_NM * 3600.0;
-    _set_V_equiv_kts( kts );
-    _set_V_calibrated_kts( kts );
-    _set_V_ground_speed( kts );
-
-    // angle of turn
-    double turn_rate = globals->get_controls()->get_aileron() * SGD_PI_4; // radians/sec
-    double turn = turn_rate * time_step;
-
-    // update euler angles
-    _set_Euler_Angles( get_Phi(), get_Theta(),
-                       fmod(get_Psi() + turn, SGD_2PI) );
-    _set_Euler_Rates(0,0,0);
-
-    // update (lon/lat) position
-    double lat2, lon2, az2;
-    if ( fabs( speed ) > SG_EPSILON ) {
-       geo_direct_wgs_84 ( get_Altitude(),
-                           get_Latitude() * SGD_RADIANS_TO_DEGREES,
-                           get_Longitude() * SGD_RADIANS_TO_DEGREES,
-                           get_Psi() * SGD_RADIANS_TO_DEGREES,
-                           dist, &lat2, &lon2, &az2 );
-
-       _set_Longitude( lon2 * SGD_DEGREES_TO_RADIANS );
-       _set_Latitude( lat2 * SGD_DEGREES_TO_RADIANS );
-    }
-
-    // cout << "lon error = " << fabs(end.x()*SGD_RADIANS_TO_DEGREES - lon2)
-    //      << "  lat error = " << fabs(end.y()*SGD_RADIANS_TO_DEGREES - lat2)
-    //      << endl;
-
-    double sl_radius, lat_geoc;
-    sgGeodToGeoc( get_Latitude(), get_Altitude(), &sl_radius, &lat_geoc );
-
-    // update altitude
-    double real_climb_rate = -globals->get_controls()->get_elevator() * 5000; // feet/sec
-    _set_Climb_Rate( real_climb_rate / 500.0 );
-    double climb = real_climb_rate * time_step;
-
-    _set_Geocentric_Position( lat_geoc, get_Longitude(), 
-                            sl_radius + get_Altitude() + climb );
-    // cout << "sea level radius (ft) = " << sl_radius << endl;
-    // cout << "(setto) sea level radius (ft) = " << get_Sea_level_radius() << endl;
-    _update_ground_elev_at_pos();
-    _set_Sea_level_radius( sl_radius * SG_METER_TO_FEET);
-    _set_Altitude( get_Altitude() + climb );
-}
diff --git a/src/FDM/MagicCarpet.hxx b/src/FDM/MagicCarpet.hxx
deleted file mode 100644 (file)
index 60e6940..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-// MagicCarpet.hxx -- interface to the "Magic Carpet" flight model
-//
-// Written by Curtis Olson, started October 1999.
-//
-// Copyright (C) 1999  Curtis L. Olson  - http://www.flightgear.org/~curt
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
-// $Id$
-
-
-#ifndef _MAGICCARPET_HXX
-#define _MAGICCARPET_HXX
-
-
-#include "flight.hxx"
-
-
-class FGMagicCarpet: public FGInterface {
-
-public:
-    FGMagicCarpet( double dt );
-    ~FGMagicCarpet();
-
-    // reset flight params to a specific position 
-    void init();
-
-    // update position based on inputs, positions, velocities, etc.
-    void update( double dt );
-
-};
-
-
-#endif // _MAGICCARPET_HXX
index dfb7f278e6d0ebf4978ff0e264610eebdebb3c85..04e9ff8f4fdb4dff241c4e2adea6033f99c8331b 100644 (file)
@@ -4,16 +4,14 @@ else
 SP_DIR =
 endif
 
-SUBDIRS        = Balloon JSBSim LaRCsim UIUCModel YASim \
+SUBDIRS        = JSBSim LaRCsim UIUCModel YASim \
           $(SP_DIR) ExternalNet ExternalPipe
 
 noinst_LIBRARIES = libFlight.a
 
 libFlight_a_SOURCES = \
-       Balloon.cxx Balloon.h \
        flight.cxx flight.hxx \
        groundcache.cxx groundcache.hxx \
-       MagicCarpet.cxx MagicCarpet.hxx \
        UFO.cxx UFO.hxx \
        NullFDM.cxx NullFDM.hxx
 
index f0295e518bc95705aca552afd6a9e5c3b32d9ce6..7271c3c69c420e4a2edae92862da4db918bef4e2 100644 (file)
@@ -3,6 +3,9 @@ noinst_LIBRARIES = libSPFDM.a
 
 libSPFDM_a_SOURCES = \
        ADA.cxx ADA.hxx \
-       ACMS.cxx ACMS.hxx
+       ACMS.cxx ACMS.hxx \
+       Balloon.cxx Balloon.h \
+       BalloonSim.cpp BalloonSim.h \
+       MagicCarpet.cxx MagicCarpet.hxx
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
index ab007a69c148d3a2f772b9e32cf0110910224ea8..b18a77c4e395663b2a7af14790f0dbb27dff81ad 100644 (file)
@@ -73,7 +73,7 @@
 
 #include "uiuc_controlInput.h"
 
-#include STL_IOSTREAM
+#include <iostream>
 
 void uiuc_controlInput()
 {
index c53d3a1c1a75e880b7fdaebfc37d5bd799ebe2e4..f2917ebf81369871a3ca8525c22721dd741e9fec 100644 (file)
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu.h"
 
index 345fa06c4c8b8955b2dc196b210ece70de5ab06c..e88f1ea7c2e91fb510d19de2ee88db31032ff665 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_CD.h"
 
index ff16c2444d939b423601d2e0f450f36f1360c2ab..d8cf1c8da484af06ad5a02b52c48ed1a1353907f 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_CL.h"
 
index f0dd8e9e6b7dca7fab5d5838bc2000f2b8b46051..283aafdd0bd5ccb6a68703e8abb9b0d347159175 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_CY.h"
 
index bbd17a7742a7d2ea807a10d000234dc794113432..4c16d62478d82308e1d473e27b5292c5d8e46692 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_Cm.h"
 
index 38f4cb9616aadc136e37ceb9fc2feae8372f1d11..5592c0afb5da2e9efd57d18f8af09ac409c83f8a 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_Cn.h"
 
index 36b52c1c05730b5572ccd24f3af7af3c643851b8..9f8bcad3e2c4e343111fa55f4f111ad2f48d0e5d 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_Croll.h"
 
index f19533111def2e24a5739857db69e0eb6adf94cd..8a5b5f2f0bf662fb66fa3635a13d6a45ecf81e0a 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_controlSurface.h"
 
index e42867c8fb83e24c5d018e5301c47c646a8ec10f..e9d2ddc3fd3d9e0e37c3615b739ffb4f2846354e 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_engine.h"
 
index 81a689684940716606061734d397a43e18755f2a..4af9238be2b8e4ebe2afeca67601c6d3efb5958c 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_fog.h"
 
index 994f7c07a8f40c0b4bef61460facb918576ac3f4..a72bff72c61a0a519e8cb224aa8691370b74466b 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_gear.h"
 
index e6d808e1b8c996c210919d788f0043e942b29ec4..8fd5a94fe69caf3be34dda0f65df74a4407e034e 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_geometry.h"
 
index fc17682da7ace70b13e3159585b962f57883c742..df16cb5180ed76ae512a729de80ec8e9b500a724 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_ice.h"
 
index 2884eeedb16fd22aa1f0c30eec6f6649528ef052..c58060a2d24346fc195cb93b0c89003531056ef0 100644 (file)
@@ -76,7 +76,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_init.h"
 
index df45eff979bf021956e34703d7ebd6b1cce12f7a..a0c2029c3f7d9e42304684849ffe78ff6a8ab792 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_mass.h"
 
index cc2a270cb369a7ea1dc8752b489a1cfd004cc6e0..2a38efc4d381d402398204ff94f6767fc953734a 100644 (file)
@@ -75,7 +75,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_misc.h"
 
index 0634a8848276c545bf379bc4785a4f50bf4c7f56..5b62e146f3b957b305ff450bc673f8902ea89022 100644 (file)
@@ -78,7 +78,7 @@
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_record.h"
 
index 01793842158b6b6b66fad4a6533d5dc3a5fb647c..911f3ef2793d994f692babe4e4a8c753257eedcf 100644 (file)
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <list>
-#include STL_FSTREAM
+#include <fstream>
 
 SG_USING_STD(list);
 SG_USING_STD(string);
index 5e2bf4b4cf451fb0a80957a6bf30697a264ca036..4908f24f34db4cf8370f2cf9c535074e75eb671f 100644 (file)
@@ -8,8 +8,8 @@
 #include "Ground.hpp"
 #include "Rotor.hpp"
 
-#include STL_IOSTREAM
-#include STL_IOMANIP
+#include <iostream>
+#include <iomanip>
 
 SG_USING_STD(setprecision);
 
index de40bda0e4f0a267b63e2f154b178bc83f392156..5b462db68b12a2e6170a6edc68ea94fe42853f9a 100644 (file)
@@ -42,8 +42,8 @@
 #  include <GL/xmesa.h>
 #endif
 
-#include STL_FSTREAM
-#include STL_STRING
+#include <fstream>
+#include <string>
 
 #include <stdlib.h>
 #include <string.h>
index c6abe35858b2bd16a7e9482840ddf11daba7a95a..de12a666e579588e2ce4696dac87fe223032935a 100644 (file)
@@ -40,7 +40,7 @@
 #  include <GL/xmesa.h>
 #endif
 
-#include STL_STRING
+#include <string>
 
 #include <stdlib.h>
 #include <string.h>
index 5aa1e3dbaae639b4dd9114430f936b3e850eb14b..ae709d290c7ca25fd1c1528070dd0c6f2769fab7 100644 (file)
@@ -28,9 +28,9 @@
 #include <simgear/compiler.h>
 
 #include <sstream>
-#include STL_IOMANIP
+#include <iomanip>
 #include <iostream>
-#include STL_STRING
+#include <string>
 SG_USING_STD(string);
 using std::cout;
 
index 4d1dc33bb2ee242208275ab81a91d7dac53a1fa1..726aabbea01c0f0629443b5157d9697c28e7aba0 100644 (file)
@@ -34,9 +34,9 @@
 
 #include <math.h>
 
-#include STL_IOSTREAM
-#include STL_FSTREAM
-#include STL_STRING
+#include <iostream>
+#include <fstream>
+#include <string>
 
 SG_USING_STD(fstream);
 SG_USING_STD(cout);
index f4168b55df72aae08b7e776088c9d617adaae67c..5db934f7411004408248a0dedf66bb8069d48c86 100644 (file)
@@ -34,8 +34,8 @@
 #include <ctype.h>
 #include <sstream>
 
-#include STL_FSTREAM
-#include STL_STRING
+#include <fstream>
+#include <string>
 #include <vector>
 
 #include <simgear/compiler.h>
index ac7e4669f969ae1a581416ec6b62c9363427117b..6f6a9eda46184db56fdfa3504dc49508f65730f6 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 
 SG_USING_STD(cout);
 SG_USING_STD(cin);
index 45e59754db26f8d6058808bbff5c927cd1e43412..28fe5d994f8b0247d392972d90c5cbdffc9653b6 100644 (file)
@@ -22,8 +22,8 @@
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
 
-#include STL_STRING
-#include STL_FSTREAM
+#include <string>
+#include <fstream>
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
index af8816d4785d83d8b3c8e70f8d9ebd118448c827..a6d95bdb3ffd1c76018bf1dbdfe577674e4b725d 100644 (file)
 
 #include <vector>
 #include <deque>
-#include STL_FSTREAM
+#include <fstream>
 
 SG_USING_STD(deque);
 SG_USING_STD(vector);
-SG_USING_NAMESPACE(std);
 
 #include <osg/State>
 
@@ -174,7 +173,7 @@ public:
 protected:
     void common_draw();
     int load(const char *, float x = 320.0f, float y = 240.0f,
-            int level = 0, const string& indent = "");
+            int level = 0, const std::string& indent = "");
 
 private:
     void draw3D();
@@ -338,7 +337,7 @@ protected:
     void draw_bullet(float, float, float);
 
     HUD         *_hud;
-    string      _name;
+    std::string      _name;
     int         _options;
     float       _x, _y, _w, _h;
     float       _center_x, _center_y;
@@ -362,7 +361,7 @@ private:
 
     Input   _input;
     Format  _mode;
-    string  _format;
+    std::string  _format;
     int     _halign;    // HUDText alignment
     int     _blink;
     bool    _box;
@@ -438,7 +437,7 @@ private:
     float  _label_gap;
     bool   _pointer;
     Format _label_fmt;
-    string _format;
+    std::string _format;
     int    _div_ratio;          // _major_divs/_minor_divs
     bool   _odd_type;           // whether to put numbers at 0/2/4 or 1/3/5
 
index 4753afd0ad66b8c217a16a4caf3723e46dbb1adb..ca450cf661bef12e2853e9b502844848f2d1297b 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 #include <sstream>
 
 #include <math.h>      // fabs()
index a7e96e5502763152a03dc19bc0154dd2bfa3bad4..b92d99086aec97227167c14920255273dce1d5ec 100644 (file)
@@ -4,8 +4,8 @@
 // This file is in the Public Domain and comes with no warranty.
 
 #include <simgear/compiler.h>
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 #include <sstream>
 
 #include "heading_indicator.hxx"
index 28be8a3a1412b481ea68a596992dd14762f5e748..036caf47cb37472882bb3b4d978fc85934e64e14 100644 (file)
@@ -7,8 +7,8 @@
 // This file is in the Public Domain and comes with no warranty.
 
 #include <simgear/compiler.h>
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 #include <sstream>
 
 #include <Main/fg_props.hxx>
index b5dde762d8a10828d285141e8f9c714ea1db82ab..01d33892d8d9a4873e1180214972ccac2f5d2b7f 100644 (file)
@@ -6,8 +6,8 @@
 // This file is in the Public Domain and comes with no warranty.
 
 #include <simgear/compiler.h>
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 #include <sstream>
 
 #include "heading_indicator_fg.hxx"
index d890ee266b6a28ffd6097f2779a80560978d0e22..3e7c07162776da24a31db79b280aaa7422194229 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 #include <sstream>
 #include <math.h>      // fabs()
 
index c8d295fee8a312e783431904053f65ba2699fa89..973b4054aad99d6f46df5edf915ace15cf5f8536 100644 (file)
@@ -4,8 +4,8 @@
 // This file is in the Public Domain and comes with no warranty.
 
 #include <simgear/compiler.h>
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 #include <sstream>
 
 #include "turn_indicator.hxx"
index f82b641433b6816f650fab44cbcb9ab2dc3a4fae..9e4a57513f4ddacac5c668b80f636704723d43ae 100644 (file)
@@ -38,7 +38,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 
-#include STL_IOSTREAM
+#include <iostream>
 SG_USING_STD(cerr);
 SG_USING_STD(endl);
 
index 50e46ad9a8f2525e0432bfae6b89ae9d5b0dac7a..96e7175afcd0f7e371272349a5ae84059368ab04 100644 (file)
@@ -8,8 +8,8 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
-#include STL_FSTREAM
+#include <string>
+#include <fstream>
 
 #include <simgear/sg_inlines.h>
 #include <simgear/debug/logstream.hxx>
index 353818a786a3c7ad81b52d939c72c148e61a297b..edf601347995641e5763f116d082413ec1eb1db1 100644 (file)
@@ -45,7 +45,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #ifdef ENABLE_SP_FDM
 #include <FDM/SP/ADA.hxx>
 #include <FDM/SP/ACMS.hxx>
+#include <FDM/SP/MagicCarpet.hxx>
+#include <FDM/SP/Balloon.h>
 #endif
-#include <FDM/Balloon.h>
 #include <FDM/ExternalNet/ExternalNet.hxx>
 #include <FDM/ExternalPipe/ExternalPipe.hxx>
 #include <FDM/JSBSim/JSBSim.hxx>
 #include <FDM/LaRCsim/LaRCsim.hxx>
-#include <FDM/MagicCarpet.hxx>
 #include <FDM/UFO.hxx>
 #include <FDM/NullFDM.hxx>
 #include <FDM/YASim/YASim.hxx>
index 5bb589d9f157a6168bc3cdfbd32a54dac092fbe6..281614cfe9b1ca646d4ec8c3c9aae4152a048a7b 100644 (file)
@@ -38,7 +38,7 @@
 #include <simgear/compiler.h>
 #include <simgear/timing/sg_time.hxx>
 
-#include STL_STRING
+#include <string>
 
 #include <Airports/simple.hxx>
 
index ccecff71b62f0656c6123e044adb5cd0e0ba4b8f..d8ffefe9a8f1d4b8bd15aef68f31e6d7bbf6e975 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>             // atoi()
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -74,7 +74,7 @@ FGIO::FGIO()
 {
 }
 
-#include STL_ALGORITHM
+#include <algorithm>
 SG_USING_STD(for_each);
 
 static void delete_ptr( FGProtocol* p ) { delete p; }
index 146f57087537098e3fee3595c94fbea0ba98a022..b0da8f0d9f65619ff19b820f295c588e647c8b1b 100644 (file)
@@ -29,7 +29,7 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 
 #include <vector>
-#include STL_STRING
+#include <string>
 
 SG_USING_STD(vector);
 SG_USING_STD(string);
index 5f1921df1865460bf0cc52a17ee1ef99583338c6..a50be105f70583245dabf2d573635ccc9526ad2c 100644 (file)
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <plib/pu.h>
 #include <osg/GraphicsContext>
 
index 07b20cfe8189ccb500b349663e30c27cac8dfe3e..3d7fe4422dee418374f154faf8de225a8a2956c3 100644 (file)
@@ -33,7 +33,7 @@
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 
-#include STL_IOSTREAM
+#include <iostream>
 
 #include <Aircraft/aircraft.hxx>
 #include <Time/tmp.hxx>
index 0d830b3bb7ada01763d25fae814cc5dfe8c86ba0..fa0c810a275590ac4a2a56f52000a826a92a7df0 100644 (file)
@@ -34,7 +34,7 @@
 #include <simgear/structure/event_mgr.hxx>
 
 #include <vector>
-#include STL_STRING
+#include <string>
 
 SG_USING_STD( vector );
 SG_USING_STD( string );
index 47187c6239efb154a368c18c24940bbf6b87e86c..adac4288282f5242d91141b411ef3a0ccd71af42 100644 (file)
@@ -5,7 +5,7 @@
 
 #include "logger.hxx"
 
-#include STL_FSTREAM
+#include <fstream>
 #include <string>
 
 SG_USING_STD(ofstream);
index 1cb754340b3b4f9ab8f20891cfa36e147e9f3eaa..0882528cbc762236233622005859bc182bd34943 100644 (file)
@@ -35,7 +35,7 @@
 #include <string.h>            // strcmp()
 #include <algorithm>
 
-#include STL_STRING
+#include <string>
 
 #include <plib/ul.h>
 
@@ -62,7 +62,6 @@
 
 SG_USING_STD(string);
 SG_USING_STD(sort);
-SG_USING_NAMESPACE(std);
 
 #ifndef VERSION
 #define VERSION "CVS "__DATE__
index 073b57a5c15cfdacd348d022f9459e36add3f68d..45f1c740a79741dee9197f27c0a86591fce404b9 100644 (file)
@@ -37,7 +37,7 @@
 #  include <config.h>
 #endif
 
-#include STL_STRING
+#include <string>
 SG_USING_STD(string);
 #include <vector>
 SG_USING_STD(vector);
index 9dd7123067bc8d08a43ed1dcb95d2b7351bd50cb..92ca9c36812877bcab0c5fa5f463d196a993aebc 100755 (executable)
@@ -24,7 +24,7 @@
 #ifndef _AIRWAYNETWORK_HXX_
 #define _AIRWAYNETWORK_HXX_
 
-#include STL_STRING
+#include <string>
 #include <istream>
 #include <set>
 #include <map>
index 666966a82e1c49b362dd8b5a05dfc8173d813e78..8a4925e086c0b183f889f3fdb99179c3637aa286 100644 (file)
@@ -34,7 +34,7 @@
 
 #  include <istream>
 
-#include STL_STRING
+#include <string>
 
 // SG_USING_STD(cout);
 // SG_USING_STD(endl);
index 8280c1df0f142471883210e60dd5acf104c329b6..91d0c539b2ccf88bb3f3334500ee867a8a42aee6 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <map>
 #include <vector>
-#include STL_STRING
+#include <string>
 
 #include "fix.hxx"
 
index 8bf2eb8d6dd617e60bc228c7942b548317c2d3dd..2bea8421895d64acdbb17dbab87edc6297403c16 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 
index f32075163b100c232a2dd5d030f730fe13394f86..7c477792cb81e4dd4141a4b37e02c66be7935d93 100644 (file)
@@ -30,7 +30,7 @@
 
 // #include <map>
 // #include <vector>
-// #include STL_STRING
+// #include <string>
 
 #include "navlist.hxx"
 #include "fixlist.hxx"
index 3b6a2fa42aab4d4fb7649d033835af964cbcfed5..ceab1d68b795e14056b2d3e3d4bb795852a3d2c7 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <map>
 #include <vector>
-#include STL_STRING
+#include <string>
 
 #include "navrecord.hxx"
 
index 4767dbf450246051fe3856b1d9e2d924ceef137f..652948747527a57b398412b9c43f879d4e1d4cc2 100644 (file)
@@ -35,7 +35,7 @@
 #include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/structure/SGReferenced.hxx>
 
-#  include <istream>
+#include <istream>
 
 #define FG_NAV_DEFAULT_RANGE 50 // nm
 #define FG_LOC_DEFAULT_RANGE 18 // nm
@@ -63,13 +63,13 @@ class FGNavRecord : public SGReferenced {
                                 // (degrees) or localizer heading
                                 // (degrees) or dme bias (nm)
 
-    string ident;              // navaid ident
-    string name;                // verbose name in nav database
-    string apt_id;              // corresponding airport id
+    std::string ident;         // navaid ident
+    std::string name;                // verbose name in nav database
+    std::string apt_id;              // corresponding airport id
 
 
     bool serviceable;          // for failure modeling
-    string trans_ident;         // for failure modeling
+    std::string trans_ident;         // for failure modeling
 
 public:
 
@@ -91,8 +91,8 @@ public:
     inline double get_multiuse() const { return multiuse; }
     inline void set_multiuse( double m ) { multiuse = m; }
     inline const char *get_ident() const { return ident.c_str(); }
-    inline const string& get_name() const { return name; }
-    inline const string& get_apt_id() const { return apt_id; }
+    inline const std::string& get_name() const { return name; }
+    inline const std::string& get_apt_id() const { return apt_id; }
     inline bool get_serviceable() const { return serviceable; }
     inline const char *get_trans_ident() const { return trans_ident.c_str(); }
 
@@ -157,7 +157,7 @@ operator >> ( std::istream& in, FGNavRecord& n )
 
     if ( n.type >= 4 && n.type <= 9 ) {
         // these types are always associated with an airport id
-        string::size_type pos = n.name.find(" ");
+        std::string::size_type pos = n.name.find(" ");
         n.apt_id = n.name.substr(0, pos);
     }
 
@@ -190,7 +190,7 @@ operator >> ( std::istream& in, FGNavRecord& n )
 
 class FGTACANRecord : public SGReferenced {
 
-    string channel;            
+    std::string channel;               
     int freq;
      
 public:
@@ -198,7 +198,7 @@ public:
     inline FGTACANRecord(void);
     inline ~FGTACANRecord(void) {}
 
-    inline const string& get_channel() const { return channel; }
+    inline const std::string& get_channel() const { return channel; }
     inline int get_freq() const { return freq; }
     friend std::istream& operator>> ( std::istream&, FGTACANRecord& );
     };
index 369a2d3bc15d0b3e990a10b1fc6199d7bcf7787a..f90e89129fae9bb8e0bcc9f267b8828d9ad7c01b 100644 (file)
@@ -38,7 +38,7 @@
 #include <errno.h>
 #include <math.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
index 4529733fd1da4990b185f5c4d7c66d2c20bf02d4..719e173d29e5d38ff6bf5600556ff60f5cd63d61 100644 (file)
@@ -36,7 +36,7 @@
 #  include <io.h>                 //lseek, read, write
 #endif
 
-#include STL_STRING
+#include <string>
 
 #include <plib/ul.h>
 
index fbaf566cdce37212a62fb6c4440180582841bf5d..eaab9f9c9893ec71da7a825b3b215f1e2a46928a 100644 (file)
@@ -38,7 +38,7 @@
 #include <errno.h>
 #include <math.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
index 50ca8da2a5838baf04e9a43291f9fd0c2add835f..1b59d9e4c19b9d8a8fec060a0c0bf9d0d0a96128 100644 (file)
@@ -36,8 +36,6 @@
 
 #include "AV400.hxx"
 
-SG_USING_NAMESPACE(std);
-
 FGAV400::FGAV400() {
 }
 
index 2256c6854a223352b1a94e9baaa28d6e114f7151..bb1fe9917a9699489f6fff6293318a7a60810b5b 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
index 9abb3c9c782e6805af3b8a9407937e9043ac429f..5af40b5b80a4a03cf365d2952fde6430ca3b872a 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
index 12399b8942a23c56aefcecc2db8a5e01afb207b5..ea6cbbe5e90bb6094df0f4c44dee78e597c04b0b 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "garmin.hxx"
 
-SG_USING_NAMESPACE(std);
+using std::string;
 
 FGGarmin::FGGarmin() {
 }
index dfabde3319c908cc847946d40eabf937c162b82e..8f02414e17a3e521d0b0208167fbde16a1c3ae0b 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
index ed5d1c368783e4887b949127af59f293ba4d1bef..d7db8cf68b0c7c1740c691a8e4111f52ca5179c3 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
index e218c149c3ed19086abad4d2e4b85716b4f75780..9991b90898d41f78a4fdda74c4e13dbf02f5fdcb 100644 (file)
@@ -34,7 +34,7 @@
 #include <algorithm>           // sort()
 #include <stdlib.h>            // atoi() atof()
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
index b5003d500acd256435c69991f5b4454ce5108b55..0a2f7485af96b91550ae0bdd360e39b0d4ea5212 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <FDM/flight.hxx>
 
index 7ff7341bffa8a852c01e6404164136698a192585..8ef2c4357277e6adfaf0e6c2ee9251fb8ba14068 100644 (file)
@@ -33,7 +33,7 @@
 
 #include <stdlib.h>            // atoi() atof()
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
index 49911cffe3dda99494e670684910f79f666622b2..1e1d3274d130c1c02fe3a480bfdf0fa1105de07f 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <FDM/flight.hxx>
 
index 6a496f984d054c7a3ef5b6bd965f86054222a8f4..c3c7276567dc47a1209da17940b4fac918503ae5 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <FDM/flight.hxx>
 #include <Main/fg_props.hxx>
index 4f5c62656bd91a8939e623bcf9d3ab75e4f01e6a..68072ae22195178c7af5e5e00e2e57d69567390b 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <iostream>
 #include <map>
index 145f1054dd8ef5df90443654baba73acd57b1e08..db92b7580bf018738d87356132ff4adb175f68a5 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <simgear/props/props.hxx>
 
index 81d8b0192f443f1921948dbb5ac919ac09ad4583..a3ae1ea1289f89897c616fb2c44a7b2c6c646b4b 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <FDM/flight.hxx>
 
index 9ebb919cea26476e7b6240fdcabe83e9b8b901e9..bc57e58acfaf8ba7b5a9a269694bdab131638fce 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <Aircraft/controls.hxx>
 #include "protocol.hxx"
index 0a9d86745c261e5c6ebc35f4c4f4675c82a2b94b..921f5aa606842aea7a544b8f50e5028faf669ac3 100644 (file)
@@ -35,9 +35,6 @@
 
 #include "nmea.hxx"
 
-SG_USING_NAMESPACE(std);
-
-
 FGNMEA::FGNMEA() {
 }
 
index 2d0fc32bf7f1ce61c858843b235448328c4d3662..55acfb693d0a7e795b1cfd9c503aa121191d23fb 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
index c7d1ac9d5fb3b573bbf4004c5f70b3d16bd95288..c3210d38e0488454e6143d13cf3d691511373333 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <FDM/flight.hxx>
 #include <Main/fg_props.hxx>
index a8d76990c60303fe7971891cc7cf1917debf4e62..35bf73488a5c9ec606b63297d889eb21b0021b34 100644 (file)
@@ -27,7 +27,7 @@
 #define _FG_PROPS_HXX
 
 #include <simgear/compiler.h>
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(string);
index bbe2aa061367411380ca37933b9abb1fd5f8728d..5472e4a6aac61461c9441699193dacbf5c51ca80 100644 (file)
@@ -28,7 +28,7 @@
 #include <simgear/compiler.h>
 #include <simgear/io/iochannel.hxx>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(string);
index 8a5f30bd9321a8270383976aa6a0459fafc629f4..bf79e3acd76dc7b93d12d9175eeb614dac5f567a 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
index 3741e255ec3707902cde421627b86a19e6699b9f..0de5bd35ab591584ae7b49205fe1eeb12e7aa409 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
index ac3088ceea86bdae546c34dcfdd09c7402b823cb..f628da370fa69bd65c64fb5e14f4c4e2e8aece84 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include "protocol.hxx"
 
index 613e422687ecf0068c5e82485149cffd20fbcba8..1e660e471a0738b3bf6beb7888e828c46bd65481 100644 (file)
@@ -32,7 +32,7 @@
 #  include <config.h>
 #endif
 
-#include STL_STRING
+#include <string>
 #include <vector>
 
 SG_USING_STD(string);
index 3cf64b09036b1ee7f8d46ba1195ee7cda2505b45..4c4677961e0f55a6989268f91a8958ad51c31de5 100644 (file)
@@ -13,7 +13,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 SG_USING_STD(string);
 
 #include <simgear/props/props.hxx>
index cea5868090760e9285295f187163c56fd7ce6d5e..cb15cff8513f73c1c2e12bdebdf260d4ec679747 100644 (file)
 
 #include SG_GL_H
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#else
-#  include <math.h>
-#endif
+#include <cmath>
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
index 2de1905a17abcbea21f637bba39aa658705210a1..a6d69e597b6b61fcd1b4fdee5403ee604ce7efef 100644 (file)
 #      include <config.h>
 #endif
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cmath>
-#  include <ctime>
-#else
-#  include <math.h>
-#  include <time.h>
-#endif
+#include <cmath>
+#include <ctime>
 
 #include <simgear/math/SGMath.hxx>
 #include <simgear/ephemeris/ephemeris.hxx>
index 28ae241a441739e8b4f789891c33f0792b89cc85..9c984b71f2a8b25d00ab1ef322c58c39e06852c1 100644 (file)
 
 #include <simgear/compiler.h>
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <ctime>
-#else
-#  include <time.h>
-#endif
+#include <ctime>
 
 /**
  * Given the current unix time in seconds, calculate seconds to the
index 48de4b7ed84885df4cf50e988cfce1e989b72759..71b34680b0097298857157470432ff7fca1aadd0 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
+#include <iostream>
 
 #include <plib/sg.h>
 
index 5c1fd578b3fbf3b03c6f229a177bb67798760918..f0dc4ffe10411e6df7a4de666276c49f3218fe5f 100644 (file)
@@ -33,8 +33,8 @@
 
 #include <simgear/compiler.h>
 
-#include STL_IOSTREAM
-#include STL_STRING
+#include <iostream>
+#include <string>
 
 #include <plib/netSocket.h>
 #include <plib/ul.h>