From eae1b99036eee1c642a7bfbb2aec43a29ed5dfe6 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Wed, 23 Mar 2011 22:30:42 +0100 Subject: [PATCH] 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) --- simgear/props/tiedpropertylist.hxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 #include -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) {} -- 2.39.5