Merge branch 'releases/2.2.0' into next

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

diff --git a/simgear/props/props_io.hxx b/simgear/props/props_io.hxx
index abcefe496f73b6424304ac0df624d101886e1379..b619c04b6f33d43bd24e588865db12e7828d4c7e 100644 (file)
--- a/simgear/props/props_io.hxx
+++ b/simgear/props/props_io.hxx
@@ -17,42 +17,38 @@
 
 #include <stdio.h>
 
-#include STL_STRING
+#include <string>
 #include <vector>
 #include <map>
-#include STL_IOSTREAM
-
-SG_USING_STD(string);
-SG_USING_STD(vector);
-SG_USING_STD(map);
-SG_USING_STD(istream);
-SG_USING_STD(ostream);
+#include <iosfwd>
 
 /**
  * Read properties from an XML input stream.
  */
-void readProperties (istream &input, SGPropertyNode * start_node,
-                    const string &base = "", int default_mode = 0);
+void readProperties (std::istream &input, SGPropertyNode * start_node,
+                    const std::string &base = "", int default_mode = 0,
+                     bool extended = false);
 
 
 /**
  * Read properties from an XML file.
  */
-void readProperties (const string &file, SGPropertyNode * start_node,
-                     int default_mode = 0);
+void readProperties (const std::string &file, SGPropertyNode * start_node,
+                     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);
 
 
 /**
  * Write properties to an XML output stream.
  */
-void writeProperties (ostream &output, const SGPropertyNode * start_node,
+void writeProperties (std::ostream &output, const SGPropertyNode * start_node,
                      bool write_all = false,
                      SGPropertyNode::Attribute archive_flag = SGPropertyNode::ARCHIVE);
 
@@ -60,7 +56,8 @@ void writeProperties (ostream &output, const SGPropertyNode * start_node,
 /**
  * Write properties to an XML file.
  */
-void writeProperties (const string &file, const SGPropertyNode * start_node,
+void writeProperties (const std::string &file,
+                      const SGPropertyNode * start_node,
                      bool write_all = false,
                      SGPropertyNode::Attribute archive_flag = SGPropertyNode::ARCHIVE);