diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx index 04b892e5..1da575a4 100644 --- a/simgear/props/condition.cxx +++ b/simgear/props/condition.cxx @@ -69,7 +69,7 @@ public: virtual bool test () const; virtual void collectDependentProperties(std::set& props) const; private: - SGSharedPtr _condition; + SGConditionRef _condition; }; @@ -89,7 +89,7 @@ public: virtual void addCondition (SGCondition * condition); virtual void collectDependentProperties(std::set& props) const; private: - std::vector > _conditions; + std::vector _conditions; }; @@ -109,7 +109,7 @@ public: virtual void addCondition (SGCondition * condition); virtual void collectDependentProperties(std::set& props) const; private: - std::vector > _conditions; + std::vector _conditions; }; diff --git a/simgear/props/condition.hxx b/simgear/props/condition.hxx index 128cdfaf..4341c239 100644 --- a/simgear/props/condition.hxx +++ b/simgear/props/condition.hxx @@ -38,6 +38,8 @@ public: virtual void collectDependentProperties(std::set& props) const { } }; +typedef SGSharedPtr SGConditionRef; + /** * Base class for a conditional components. @@ -56,7 +58,7 @@ public: virtual const SGCondition * getCondition () const { return _condition; } virtual bool test () const; private: - SGSharedPtr _condition; + SGConditionRef _condition; };