canvas::Layout: support for contents margins.

[simgear.git] / simgear / props / condition.cxx

diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx
index bfc1bf618fd0beff674b1071fe9e50dff70331a2..1da575a4dbfe3c51623f59fc8633f5ed627ac373 100644 (file)
--- a/simgear/props/condition.cxx
+++ b/simgear/props/condition.cxx
@@ -22,6 +22,8 @@
 
 using std::istream;
 using std::ostream;
+using std::string;
+
 /**
  * Condition for a single property.
  *
@@ -67,7 +69,7 @@ public:
   virtual bool test () const;
   virtual void collectDependentProperties(std::set<const SGPropertyNode*>& props) const;
 private:
-  SGSharedPtr<SGCondition> _condition;
+  SGConditionRef _condition;
 };
 
 
@@ -87,7 +89,7 @@ public:
   virtual void addCondition (SGCondition * condition);
   virtual void collectDependentProperties(std::set<const SGPropertyNode*>& props) const;
 private:
-  std::vector<SGSharedPtr<SGCondition> > _conditions;
+  std::vector<SGConditionRef> _conditions;
 };
 
 
@@ -107,7 +109,7 @@ public:
   virtual void addCondition (SGCondition * condition);
   virtual void collectDependentProperties(std::set<const SGPropertyNode*>& props) const;
 private:
-  std::vector<SGSharedPtr<SGCondition> > _conditions;
+  std::vector<SGConditionRef> _conditions;
 };