Reset: work with threaded OSG modes

[flightgear.git] / src / FDM / UIUCModel / uiuc_menu_fog.cpp

diff --git a/src/FDM/UIUCModel/uiuc_menu_fog.cpp b/src/FDM/UIUCModel/uiuc_menu_fog.cpp
index d9c19ee16db9c2c3bdf3e3696d30774102d7e933..a8e7c395cea7e3369ec34ca8c3a5b133d2a4e40f 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_fog.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_fog.cpp
@@ -66,31 +66,25 @@
 
  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., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA or view http://www.gnu.org/copyleft/gpl.html.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 **********************************************************************/
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #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,