Merge branch 'curt/make' into next

[flightgear.git] / src / Main / fg_props.hxx

diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx
index ef6ed69d906430a274ac073ee26afc0c5ece7179..41772ff358345d94f66eeab7b8f9563e9f26d7ae 100644 (file)
--- a/src/Main/fg_props.hxx
+++ b/src/Main/fg_props.hxx
@@ -9,9 +9,10 @@
 #include <iosfwd>
 
 #include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include <Main/globals.hxx>
-\f
+
 ////////////////////////////////////////////////////////////////////////
 // Property management.
 ////////////////////////////////////////////////////////////////////////
@@ -533,7 +534,7 @@ fgTie (const char * name, T * obj, int index,
 class FGMakeUpperCase : public SGPropertyChangeListener {
 public:
     void valueChanged(SGPropertyNode *node) {
-        if (node->getType() != SGPropertyNode::STRING)
+        if (node->getType() != simgear::props::STRING)
             return;
 
         char *s = const_cast<char *>(node->getStringValue());