Cleanup

src/shared/Communication.h

 #ifndef COMMUNICATION_H
 #define COMMUNICATION_H
 
 #include <memory>
 #include <sstream>
 #include <stdexcept>
 #include <stdint.h>
 #include <string>
 #include <vector>
 #include <Windows.h>
@@ skipping 18 matching lines @@
   };
   enum ValueType : uint32_t {
     TYPE_PROC, TYPE_STRING, TYPE_WSTRING, TYPE_INT64, TYPE_INT32, TYPE_BOOL
   };
   typedef uint32_t SizeType;
 
   class InputBuffer
   {
   public:
     InputBuffer(const std::string& data) : buffer(data), hasType(false) {}
+    InputBuffer(const InputBuffer& copy) { hasType = copy.hasType; buffer = std::istringstream(copy.buffer.str()); currentType = copy.currentType; }
     InputBuffer& operator>>(ProcType& value) { return Read(value, TYPE_PROC); }
     InputBuffer& operator>>(std::string& value) { return ReadString(value, TYPE_STRING); }
     InputBuffer& operator>>(std::wstring& value) { return ReadString(value, TYPE_WSTRING); }
     InputBuffer& operator>>(int64_t& value) { return Read(value, TYPE_INT64); }
     InputBuffer& operator>>(int32_t& value) { return Read(value, TYPE_INT32); }
     InputBuffer& operator>>(bool& value) { return Read(value, TYPE_BOOL); }
+    ValueType GetType();
+    bool IsEmpty() { return buffer.eof(); }

[Wladimir Palant, 2013/07/22 06:43:11]

This is just wrong :-(
eof() doesn't mean that the buffer is empty - it can easily mean that the entire
buffer has been read. And, as I mentioned before, you really shouldn't need
that.

[Oleksandr, 2013/07/22 09:53:31]

I guess the name was just wrong. Should've been IsEof(). That's what we were
really interested in.

On 2013/07/22 06:43:11, Wladimir Palant wrote:

   private:
     std::istringstream buffer;
     ValueType currentType;
     bool hasType;
 
     void CheckType(ValueType expectedType);
 
     template<class T>
     InputBuffer& ReadString(T& value, ValueType expectedType)
     {
@@ skipping 18 matching lines @@
       ReadBinary(value);
       return *this;
     }
 
     template<class T>
     void ReadBinary(T& value)
     {
       buffer.read(reinterpret_cast<char*>(&value), sizeof(T));
       if (buffer.fail())
         throw new std::runtime_error("Unexpected end of input buffer");
+      hasType = false;
     }
   };
 
   class OutputBuffer
   {
   public:
     OutputBuffer() {}
 
     // Explicit copy constructor to allow returning OutputBuffer by value
     OutputBuffer(const OutputBuffer& copy) : buffer(copy.buffer.str()) {}
@@ skipping 68 matching lines @@
 
     InputBuffer ReadMessage();
     void WriteMessage(OutputBuffer& message);
 
   protected:
     HANDLE pipe;
   };
 }
 
 #endif