- changed getAttribute to avoid MSVC compiler warning
This commit is contained in:
@@ -358,8 +358,9 @@ SGPropertyNode::SGPropertyNode (const string &name,
|
|||||||
*/
|
*/
|
||||||
SGPropertyNode::~SGPropertyNode ()
|
SGPropertyNode::~SGPropertyNode ()
|
||||||
{
|
{
|
||||||
for (int i = 0; i < (int)_children.size(); i++)
|
for (int i = 0; i < (int)_children.size(); i++) {
|
||||||
delete _children[i];
|
delete _children[i];
|
||||||
|
}
|
||||||
clear_value();
|
clear_value();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ SG_USING_STD(istream);
|
|||||||
SG_USING_STD(ostream);
|
SG_USING_STD(ostream);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef NONE
|
||||||
|
#pragma warn A sloppy coder has defined NONE as a macro!
|
||||||
|
#undef NONE
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef ALIAS
|
#ifdef ALIAS
|
||||||
#pragma warn A sloppy coder has defined ALIAS as a macro!
|
#pragma warn A sloppy coder has defined ALIAS as a macro!
|
||||||
#undef ALIAS
|
#undef ALIAS
|
||||||
@@ -694,7 +699,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
* Check a single mode attribute for the property node.
|
* 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); }
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user