math: Move lerp function into SGMisc.

[simgear.git] / simgear / props / tiedpropertylist.hxx

diff --git a/simgear/props/tiedpropertylist.hxx b/simgear/props/tiedpropertylist.hxx
index 28cdb5183b2ffd15ed188291d941c3516b464a8b..7fb354c4da043bd7a7e4743c0abe32ec0d83008d 100644 (file)
--- a/simgear/props/tiedpropertylist.hxx
+++ b/simgear/props/tiedpropertylist.hxx
@@ -21,7 +21,7 @@
 #ifndef __TIEDPROPERTYLIST_HXX
 #define  __TIEDPROPERTYLIST_HXX
 #include <simgear/props/props.hxx>
-using simgear::PropertyList;
+#include <assert.h>
 
 namespace simgear {
 
@@ -30,10 +30,20 @@ namespace simgear {
  * This helper class keeps track of tied properties and unties
  * each tied property when this class gets destructed.
 */
-class TiedPropertyList : PropertyList {
+class TiedPropertyList : simgear::PropertyList {
 public:
     TiedPropertyList() {}
     TiedPropertyList( SGPropertyNode_ptr root ) : _root(root) {}
+    virtual ~TiedPropertyList()
+    { 
+        _root = 0;
+        if (size()>0)
+        {
+            SG_LOG(SG_GENERAL, SG_ALERT, "Detected properties with dangling ties. Use 'Untie' before removing a TiedPropertyList.");
+            // running debug mode: go, fix it!
+            assert(size() == 0);
+        }
+    }
 
     void setRoot( SGPropertyNode_ptr root ) { _root = root; }
     SGPropertyNode_ptr getRoot() const { return _root; }
@@ -41,7 +51,7 @@ public:
     template<typename T> SGPropertyNode_ptr Tie( SGPropertyNode_ptr node, const SGRawValue<T> &rawValue, bool useDefault = true  ) {
         bool success = node->tie( rawValue, useDefault );
         if( success ) {
-            SG_LOG( SG_ALL, SG_INFO, "Tied " << node->getPath() );
+            SG_LOG( SG_ALL, SG_DEBUG, "Tied " << node->getPath() );
             push_back( node );
         } else {
 #if PROPS_STANDALONE
@@ -115,7 +125,7 @@ public:
 
     void Untie() {
         while( size() > 0 ) {
-            SG_LOG( SG_ALL, SG_INFO, "untie of " << back()->getPath() );
+            SG_LOG( SG_ALL, SG_DEBUG, "untie of " << back()->getPath() );
             back()->untie();
             pop_back();
         }