fly/flightgear
1
0
Fork 0
Code Activity

Suppress warnings

Browse source
This commit is contained in:
fredb 2009-06-14 11:00:01 +00:00 committed by Tim Moore
parent d27097d7b8
commit 3b024e3dab
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Instrumentation/mk_viii.hxx
View file

@ -40,6 +40,11 @@ using std::map;
#include <Airports/simple.hxx> #include <Airports/simple.hxx>
#include <Main/globals.hxx> #include <Main/globals.hxx>
#ifdef _MSC_VER
# pragma warning( push )
# pragma warning( disable: 4355 )
#endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// MK_VIII //////////////////////////////////////////////////////////////////// // MK_VIII ////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -1646,4 +1651,8 @@ public:
virtual void update (double dt); virtual void update (double dt);
}; };
#ifdef _MSC_VER
# pragma warning( pop )
#endif
#endif // __INSTRUMENTS_MK_VIII_HXX #endif // __INSTRUMENTS_MK_VIII_HXX

2
src/Main/fg_commands.cxx
View file

@ -1250,7 +1250,7 @@ do_play_audio_sample (const SGPropertyNode * arg)
fx->play_message( path, file, volume ); fx->play_message( path, file, volume );
return true; return true;
} catch (const sg_io_exception& e) { } catch (const sg_io_exception&) {
SG_LOG(SG_GENERAL, SG_ALERT, "play-audio-sample: " SG_LOG(SG_GENERAL, SG_ALERT, "play-audio-sample: "
"failed to load" << path << '/' << file); "failed to load" << path << '/' << file);
return false; return false;

6
src/Model/modelmgr.cxx
View file

@ -3,6 +3,10 @@
// //
// This file is in the Public Domain, and comes with no warranty. // This file is in the Public Domain, and comes with no warranty.
#ifdef _MSC_VER
# pragma warning( disable: 4355 )
#endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
@ -172,7 +176,7 @@ struct UpdateFunctor : public std::unary_function<FGModelMgr::Instance*, void>
pitch = testNan(instance->pitch_deg_node->getDoubleValue()); pitch = testNan(instance->pitch_deg_node->getDoubleValue());
if (instance->heading_deg_node != 0) if (instance->heading_deg_node != 0)
heading = testNan(instance->heading_deg_node->getDoubleValue()); heading = testNan(instance->heading_deg_node->getDoubleValue());
} catch (const sg_range_exception& e) { } catch (const sg_range_exception&) {
const char *path = instance->node->getStringValue("path", const char *path = instance->node->getStringValue("path",
"unknown"); "unknown");
SG_LOG(SG_GENERAL, SG_INFO, "Instance of model " << path SG_LOG(SG_GENERAL, SG_INFO, "Instance of model " << path