X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fserver.hxx;h=684cee8ac9b2c693c47c88fa9787e180a936c29b;hp=f3ace10d718916f1eb8ebd3f707096e117f440e5;hb=9a5d7790b094439b9a6f16983e20493c0e43ee02;hpb=45a2ebc9695c4d7be6548b7e0f800d117ae56a0b

diff --git a/src/server.hxx b/src/server.hxx
index f3ace10..684cee8 100644
--- a/src/server.hxx
+++ b/src/server.hxx
@@ -56,9 +56,6 @@ class server_connection : public connection
         void set_id(unsigned int _connection_id)
             { connection_id=_connection_id; }
 
-        /// vector initialized for all callback-types, all elements in each list will be called
-        std::vector<std::list<boost::function<void ()> > > callbacks;
-
     protected:
         server *my_server;
 
@@ -66,11 +63,7 @@ class server_connection : public connection
 
         std::ostream* get_logstream(log_level_values level);
 
-        void do_callbacks(callback_event_type event);
-
     public:
-        virtual ~server_connection();
-
         void check_timeout();
         void reset_timeout();
         void set_timeout(int _timeout)
@@ -80,8 +73,6 @@ class server_connection : public connection
         unsigned int get_id()
             { return connection_id; }
 
-        void close();
-
         void add_callback(callback_event_type event, const boost::function<void ()>& func);
 };
 
@@ -139,7 +130,7 @@ class server
             @retval true if new data was found (does not mean that the received data 
                     is a complete packet though)
         */
-        virtual bool fill_buffer(long long usec_timeout=-1, long long* timeout_remaining=NULL)=0;
+        virtual bool fill_buffer(long long usec_timeout=-1, long long* usec_timeout_remaining=NULL)=0;
 
         void cleanup();