FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep PropertyList outside global namespace

Browse Source 
Avoids conflict with FG's GUI widget "PropertyList"...
(don't use "using..." in header files since namespaces become useless then)
This commit is contained in:
ThorstenB
2011-03-23 22:30:42 +01:00
parent 44f27b23d0
commit eae1b99036
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/props/tiedpropertylist.hxx
+1 -2
View File
@@ -22,7 +22,6 @@
#define __TIEDPROPERTYLIST_HXX #define __TIEDPROPERTYLIST_HXX
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <assert.h> #include <assert.h>
using simgear::PropertyList;
namespace simgear { namespace simgear {
@@ -31,7 +30,7 @@ namespace simgear {
* This helper class keeps track of tied properties and unties * This helper class keeps track of tied properties and unties
* each tied property when this class gets destructed. * each tied property when this class gets destructed.
*/ */
class TiedPropertyList : PropertyList { class TiedPropertyList : simgear::PropertyList {
public: public:
TiedPropertyList() {} TiedPropertyList() {}
TiedPropertyList( SGPropertyNode_ptr root ) : _root(root) {} TiedPropertyList( SGPropertyNode_ptr root ) : _root(root) {}