X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2Fmodelmgr.cxx;h=600086d29e9d77ece1819bc319f6e8f6fac1fa87;hb=d2799cd8321e964ecc87e5deb9a4c61c3c12e69c;hp=a7f543f1ebada0c253283faca328533b254153f0;hpb=fd492a297aee6d40c58f71b1889847b6668af3fd;p=flightgear.git diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx index a7f543f1e..600086d29 100644 --- a/src/Model/modelmgr.cxx +++ b/src/Model/modelmgr.cxx @@ -3,6 +3,10 @@ // // This file is in the Public Domain, and comes with no warranty. +#ifdef _MSC_VER +# pragma warning( disable: 4355 ) +#endif + #ifdef HAVE_CONFIG_H # include #endif @@ -25,7 +29,7 @@ #include "modelmgr.hxx" -SG_USING_STD(vector); +using std::vector; using namespace simgear; @@ -172,7 +176,7 @@ struct UpdateFunctor : public std::unary_function pitch = testNan(instance->pitch_deg_node->getDoubleValue()); if (instance->heading_deg_node != 0) 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", "unknown"); SG_LOG(SG_GENERAL, SG_INFO, "Instance of model " << path