fg_traits.hxx -> sg_traits.hxx

[simgear.git] / simgear / misc / props_test.cxx

diff --git a/simgear/misc/props_test.cxx b/simgear/misc/props_test.cxx
index 2f033ea6cd6eca58451e1e23b1bc3501d485906c..3ee2552d35349a809e21f7e4d4cd0c6509f56ef5 100644 (file)
--- a/simgear/misc/props_test.cxx
+++ b/simgear/misc/props_test.cxx
@@ -3,11 +3,19 @@
 // Test harness.
 ////////////////////////////////////////////////////////////////////////
 
-#include <iostream>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
 #include "props.hxx"
 
-using std::cout;
-using std::endl;
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(cout);
+SG_USING_STD(endl);
+#endif
 
 
 \f
@@ -309,7 +317,7 @@ test_property_nodes ()
   cout << "Looking for all /hack[0]/bar children" << endl;
   vector<SGPropertyNode *> bar = child->getChildren("bar");
   cout << "There are " << bar.size() << " matches" << endl;
-  for (int i = 0; i < bar.size(); i++)
+  for (int i = 0; i < (int)bar.size(); i++)
     cout << bar[i]->getName() << '[' << bar[i]->getIndex() << ']' << endl;
   cout << endl;
 
@@ -321,7 +329,7 @@ test_property_nodes ()
 }
 
 
-main (int ac, char ** av)
+int main (int ac, char ** av)
 {
   test_value();
   test_property_nodes();
@@ -335,4 +343,6 @@ main (int ac, char ** av)
       writeProperties(cout, &root);
     cout << endl;
   }
+
+  return 0;
 }