Update Mac configure script for new ALUT scheme; support --with-alut-framework.

[flightgear.git] / src / Network / props.cxx

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index ec1a924e24c10493739f2aeb5ad4826ae9a63886..e6760eaff1a0bce67540ff1e068473a423668786 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -44,8 +44,8 @@
 
 #include "props.hxx"
 
-SG_USING_STD(stringstream);
-SG_USING_STD(ends);
+using std::stringstream;
+using std::ends;
 
 using std::cout;
 using std::endl;
@@ -118,6 +118,8 @@ PropsChannel::collectIncomingData( const char* s, int n )
 static string
 getValueTypeString( const SGPropertyNode *node )
 {
+    using namespace simgear;
+
     string result;
 
     if ( node == NULL )
@@ -125,22 +127,22 @@ getValueTypeString( const SGPropertyNode *node )
         return "unknown";
     }
 
-    SGPropertyNode::Type type = node->getType();
-    if ( type == SGPropertyNode::UNSPECIFIED ) {
+    props::Type type = node->getType();
+    if ( type == props::UNSPECIFIED ) {
         result = "unspecified";
-    } else if ( type == SGPropertyNode::NONE ) {
+    } else if ( type == props::NONE ) {
         result = "none";
-    } else if ( type == SGPropertyNode::BOOL ) {
+    } else if ( type == props::BOOL ) {
         result = "bool";
-    } else if ( type == SGPropertyNode::INT ) {
+    } else if ( type == props::INT ) {
         result = "int";
-    } else if ( type == SGPropertyNode::LONG ) {
+    } else if ( type == props::LONG ) {
         result = "long";
-    } else if ( type == SGPropertyNode::FLOAT ) {
+    } else if ( type == props::FLOAT ) {
         result = "float";
-    } else if ( type == SGPropertyNode::DOUBLE ) {
+    } else if ( type == props::DOUBLE ) {
         result = "double";
-    } else if ( type == SGPropertyNode::STRING ) {
+    } else if ( type == props::STRING ) {
         result = "string";
     }