From: ThorstenB <brehmt@gmail.com>
Date: Wed, 23 Mar 2011 21:30:42 +0000 (+0100)
Subject: Keep PropertyList outside global namespace
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eae1b99036eee1c642a7bfbb2aec43a29ed5dfe6;p=simgear.git

Keep PropertyList outside global namespace
Avoids conflict with FG's GUI widget "PropertyList"...
(don't use "using..." in header files since namespaces become useless then)
---

diff --git a/simgear/props/tiedpropertylist.hxx b/simgear/props/tiedpropertylist.hxx
index c825d105..f33478ac 100644
--- a/simgear/props/tiedpropertylist.hxx
+++ b/simgear/props/tiedpropertylist.hxx
@@ -22,7 +22,6 @@
 #define  __TIEDPROPERTYLIST_HXX
 #include <simgear/props/props.hxx>
 #include <assert.h>
-using simgear::PropertyList;
 
 namespace simgear {
 
@@ -31,7 +30,7 @@ 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) {}