--- a/src/proto2/NetworkTCP.hh	Thu Nov 20 20:27:12 2008 +0000
+++ b/src/proto2/NetworkTCP.hh	Thu Nov 20 22:10:28 2008 +0000
@@ -12,11 +12,6 @@
 const size_t NETWORK_TCP_INITIAL_IN_BUF = 4096;
 const size_t NETWORK_TCP_INITIAL_OUT_BUF = 0;
 
-class NetworkDisconnectError : public Error {
-    public:
-        NetworkDisconnectError (const std::string &message) : Error(message) { }
-};
-
 class NetworkBufferError : public Error {
     public:
         NetworkBufferError (const std::string &message) : Error(message) { }
@@ -24,7 +19,7 @@
 
 class NetworkBuffer {
     private:
-        NetworkSocket &socket;
+        NetworkSocket socket;
 
         char *buf;
         size_t size, offset;
@@ -43,7 +38,8 @@
     public:    
         void push_write (char *buf_ptr, size_t buf_size);
         void flush_write (void);
-        template <typename PrefixType> void write_prefix (char *buf, PrefixType prefix);
+        void write_prefix (char *buf, uint16_t prefix);
+        void write_prefix (char *buf, uint32_t prefix);
         
         bool try_read (size_t item_size);
         bool peek_prefix (uint16_t &ref);