Add a link library needed by Irix.

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

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index 482ea18dd3b9cf1efe6fbf7304d2275647785d8d..cc319d84d2fc5f623543975db674f7f2e7f7fe8c 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -31,12 +31,14 @@
 
 #include <stdlib.h>            // atoi() atof()
 
-#include <strstream>
+#include STL_STRSTREAM
 
 #include "props.hxx"
 
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
 SG_USING_STD(cout);
 SG_USING_STD(istrstream);
+#endif
 
 FGProps::FGProps() {
 }
@@ -70,25 +72,27 @@ bool FGProps::open() {
 
 
 // return a human readable form of the value "type"
-static string getValueTypeString( const SGValue *v ) {
+static string getValueTypeString( const SGPropertyNode *node ) {
     string result;
 
-    if ( v == NULL ) {
+    if ( node == NULL ) {
        return "unknown";
     }
 
-    SGValue::Type type = v->getType();
-    if ( type == SGValue::UNKNOWN ) {
-       result = "unknown";
-    } else if ( type == SGValue::BOOL ) {
+    SGPropertyNode::Type type = node->getType();
+    if ( type == SGPropertyNode::UNSPECIFIED ) {
+       result = "unspecified";
+    } else if ( type == SGPropertyNode::BOOL ) {
        result = "bool";
-    } else if ( type == SGValue::INT ) {
+    } else if ( type == SGPropertyNode::INT ) {
        result = "int";
-    } else if ( type == SGValue::FLOAT ) {
+    } else if ( type == SGPropertyNode::LONG ) {
+       result = "long";
+    } else if ( type == SGPropertyNode::FLOAT ) {
        result = "float";
-    } else if ( type == SGValue::DOUBLE ) {
+    } else if ( type == SGPropertyNode::DOUBLE ) {
        result = "double";
-    } else if ( type == SGValue::STRING ) {
+    } else if ( type == SGPropertyNode::STRING ) {
        result = "string";
     }
 
@@ -125,7 +129,7 @@ bool FGProps::process_command( const char *cmd ) {
            } else {
                string value = node->getStringValue ( name, "" );
                line += " =\t'" + value + "'\t(";
-               line += getValueTypeString( node->getValue( name ) );
+               line += getValueTypeString( node->getNode( name ) );
                line += ")\n";
            }
            io->writestring( line.c_str() );
@@ -178,7 +182,7 @@ bool FGProps::process_command( const char *cmd ) {
 
            string value = node->getStringValue ( tokens[1], "" );
            string tmp = tokens[1] + " = '" + value + "' (";
-           tmp += getValueTypeString( node->getValue( tokens[1] ) );
+           tmp += getValueTypeString( node->getNode( tokens[1] ) );
            tmp += ")\n";
  
            io->writestring( tmp.c_str() );
@@ -187,13 +191,13 @@ bool FGProps::process_command( const char *cmd ) {
         if ( tokens.size() <= 2 ) {
            // do nothing
        } else {
-           node->getValue( tokens[1], true )->setStringValue(tokens[2]);
+           node->getNode( tokens[1], true )->setStringValue(tokens[2]);
 
            // now fetch and write out the new value as confirmation
            // of the change
            string value = node->getStringValue ( tokens[1], "" );
            string tmp = tokens[1] + " = '" + value + "' (";
-           tmp += getValueTypeString( node->getValue( tokens[1] ) );
+           tmp += getValueTypeString( node->getNode( tokens[1] ) );
            tmp += ")\n";
  
            io->writestring( tmp.c_str() );