From b4efe8f374089563dacaec40fd84127e8176a5e6 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 12 Jun 2001 02:48:24 +0000 Subject: [PATCH] - added missing return statement for getAliasTarget - changed SGValue::Type to SGPropertyNode::Type for all of SGPropertyNode --- simgear/misc/props.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/simgear/misc/props.cxx b/simgear/misc/props.cxx index 42ce347d..9415b28f 100644 --- a/simgear/misc/props.cxx +++ b/simgear/misc/props.cxx @@ -1212,6 +1212,7 @@ SGPropertyNode::getAliasTarget () return _target; } else { _target = find_node_by_value(getRootNode(), _value->getAlias()); + return _target; } } @@ -1227,6 +1228,7 @@ SGPropertyNode::getAliasTarget () const // FIXME: const cast _target = find_node_by_value((SGPropertyNode *)getRootNode(), _value->getAlias()); + return _target; } } @@ -1342,13 +1344,13 @@ SGPropertyNode::getPath (bool simplify) const return path; } -SGValue::Type +SGPropertyNode::Type SGPropertyNode::getType () const { if (_value != 0) - return _value->getType(); + return (Type)(_value->getType()); else - return SGValue::UNKNOWN; + return UNKNOWN; } @@ -1590,11 +1592,11 @@ SGPropertyNode::getValue (const string &relative_path) const /** * Get the value type for another node. */ -SGValue::Type +SGPropertyNode::Type SGPropertyNode::getType (const string &relative_path) const { const SGPropertyNode * node = getNode(relative_path); - return (node == 0 ? SGValue::UNKNOWN : node->getType()); + return (node == 0 ? UNKNOWN : (Type)(node->getType())); }