X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fprops%2Fprops_io.hxx;h=92c3bef378f14d733edaf79bac33f90a2980e62a;hb=708ae35068499af33329f9db91f55441f4956acb;hp=abcefe496f73b6424304ac0df624d101886e1379;hpb=106198fa20b0c15024f74f2720a15c6fe7d11723;p=simgear.git

diff --git a/simgear/props/props_io.hxx b/simgear/props/props_io.hxx
index abcefe49..92c3bef3 100644
--- 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);
 
@@ -68,7 +65,8 @@ void writeProperties (const string &file, const SGPropertyNode * start_node,
 /**
  * Copy properties from one node to another.
  */
-bool copyProperties (const SGPropertyNode *in, SGPropertyNode *out);
+bool copyProperties (const SGPropertyNode *in, SGPropertyNode *out,
+                     int attr_value=0, int attr_mask=0);
 
 
 #endif // __PROPS_IO_HXX