From ea24640f9654883f4fabdb25ddbae9beef71df85 Mon Sep 17 00:00:00 2001 From: ehofman Date: Sun, 13 Apr 2003 21:25:46 +0000 Subject: [PATCH] MSVC6 updates --- src/FDM/JSBSim/FGJSBBase.h | 3 ++- src/GUI/new_gui.cxx | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/FDM/JSBSim/FGJSBBase.h b/src/FDM/JSBSim/FGJSBBase.h index 49275cff0..3bb80e6d3 100644 --- a/src/FDM/JSBSim/FGJSBBase.h +++ b/src/FDM/JSBSim/FGJSBBase.h @@ -71,8 +71,9 @@ using std::queue; #endif - +#if !defined(WIN32) || defined(__GNUC__) using std::max; +#endif #ifdef __FreeBSD__ // define gcvt on FreeBSD diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx index 67edea609..63f41cba9 100644 --- a/src/GUI/new_gui.cxx +++ b/src/GUI/new_gui.cxx @@ -5,12 +5,14 @@ #include #include +#include #include #include
#include "menubar.hxx" #include "dialog.hxx" +SG_USING_STD(map); //////////////////////////////////////////////////////////////////////// -- 2.39.5