Merge branch 'fred/precip' into next

[simgear.git] / simgear / props / props_io.hxx

diff --git a/simgear/props/props_io.hxx b/simgear/props/props_io.hxx
index 34fe33a3499cd895f56f12cc176f378b8f288870..b619c04b6f33d43bd24e588865db12e7828d4c7e 100644 (file)
--- a/simgear/props/props_io.hxx
+++ b/simgear/props/props_io.hxx
@@ -17,31 +17,32 @@
 
 #include <stdio.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 #include <map>
-#include <istream>
-#include <ostream>
+#include <iosfwd>
 
 /**
  * Read properties from an XML input stream.
  */
 void readProperties (std::istream &input, SGPropertyNode * start_node,
-                    const std::string &base = "", int default_mode = 0);
+                    const std::string &base = "", int default_mode = 0,
+                     bool extended = false);
 
 
 /**
  * Read properties from an XML file.
  */
 void readProperties (const std::string &file, SGPropertyNode * start_node,
-                     int default_mode = 0);
+                     int default_mode = 0, bool extended = false);
 
 
 /**
  * Read properties from an in-memory buffer.
  */
 void readProperties (const char *buf, const int size,
-                     SGPropertyNode * start_node, int default_mode = 0);
+                     SGPropertyNode * start_node, int default_mode = 0,
+                     bool extended = false);
 
 
 /**