streams update: get rid of nType and nVersion.

furszy · furszy · commit b8c1dda66e6f · 2021-08-10T09:43:24.000-03:00
Plus support deserializing into temporaries
diff --git a/src/streams.h b/src/streams.h
@@ -38,17 +38,31 @@ class OverrideStream
     OverrideStream<Stream>& operator<<(const T& obj)
     {
         // Serialize to this stream
-        ::Serialize(*this->stream, obj, nType, nVersion);
+        ::Serialize(*this, obj);
         return (*this);
     }
 
     template<typename T>
     OverrideStream<Stream>& operator>>(T&& obj)
     {
         // Unserialize from this stream
-        ::Unserialize(*this->stream, obj, nType, nVersion);
+        ::Unserialize(*this, obj);
         return (*this);
     }
+
+    void write(const char* pch, size_t nSize)
+    {
+        stream->write(pch, nSize);
+    }
+
+    void read(char* pch, size_t nSize)
+    {
+        stream->read(pch, nSize);
+    }
+
+    int GetVersion() const { return nVersion; }
+    int GetType() const { return nType; }
+    size_t size() const { return stream->size(); }
 };
 
 /** Double ended buffer combining vector and stream-like interfaces.
@@ -594,6 +608,9 @@ class CBufferedFile
         fclose();
     }
 
+    int GetVersion() const { return nVersion; }
+    int GetType() const { return nType; }
+
     // Disallow copies
     CBufferedFile(const CBufferedFile&) = delete;
     CBufferedFile& operator=(const CBufferedFile&) = delete;
