- changed getAttribute to avoid MSVC compiler warning

diff --git a/simgear/misc/props.cxx b/simgear/misc/props.cxx
index 66e2c11691eb4c8285d2b61f88b74dace5bf2ca8..7e911668619bff81e01a607215582a9205c73823 100644 (file)
--- a/simgear/misc/props.cxx
+++ b/simgear/misc/props.cxx
@@ -358,8 +358,9 @@ SGPropertyNode::SGPropertyNode (const string &name,
  */
 SGPropertyNode::~SGPropertyNode ()
 {
-  for (int i = 0; i < (int)_children.size(); i++)
+  for (int i = 0; i < (int)_children.size(); i++) {
     delete _children[i];
+  }
   clear_value();
 }
 

diff --git a/simgear/misc/props.hxx b/simgear/misc/props.hxx
index bcaf66647732cb575a83d61262c3c61f3b37cf40..df15d9d6025d69e711ef5aa5a9534e5f92daa444 100644 (file)
--- a/simgear/misc/props.hxx
+++ b/simgear/misc/props.hxx
@@ -27,6 +27,11 @@ SG_USING_STD(istream);
 SG_USING_STD(ostream);
 #endif
 
+#ifdef NONE
+#pragma warn A sloppy coder has defined NONE as a macro!
+#undef NONE
+#endif
+
 #ifdef ALIAS
 #pragma warn A sloppy coder has defined ALIAS as a macro!
 #undef ALIAS
@@ -694,7 +699,7 @@ public:
   /**
    * Check a single mode attribute for the property node.
    */
-  bool getAttribute (Attribute attr) const { return (bool)(_attr & attr); }
+  bool getAttribute (Attribute attr) const { return ((_attr & attr) != 0); }
 
 
   /**