Brought in the final round of 3.0 code, although it does not compile yet:

report, session, parts of xpath, main, journal, option.

1 files changed, 4 insertions, 0 deletions

diff --git a/binary.h b/binary.h
index 0a8e1520..852dfe56 100644
--- a/binary.h
+++ b/binary.h
@@ -205,6 +205,9 @@ inline string read_string(const char *& data) {
   return temp;
 }
 
+void read_string(std::istream& in, optional<string>& str);
+void read_string(const char *& data, optional<string>& str);
+
 
 template <typename T>
 inline void write_number_nocheck(std::ostream& out, T num) {
@@ -262,6 +265,7 @@ void write_long(std::ostream& out, T num)
 }
 
 void write_string(std::ostream& out, const string& str);
+void write_string(std::ostream& out, const optional<string>& str);
 
 template <typename T>
 inline void write_object(std::ostream& out, const T& journal) {