Index: libclaw-1.7.0/claw/impl/socket_stream.tpp
===================================================================
--- libclaw-1.7.0.orig/claw/impl/socket_stream.tpp	2012-05-04 11:19:54.732395906 +0000
+++ libclaw-1.7.0/claw/impl/socket_stream.tpp	2012-05-04 11:20:47.852397882 +0000
@@ -39,7 +39,7 @@
 ( int read_delay )
   : m_buffer(read_delay)
 {
-  init(&m_buffer);
+  this->init(&m_buffer);
 } // basic_socket_stream::basic_socket_stream()
 
 /*----------------------------------------------------------------------------*/
@@ -55,7 +55,7 @@
 ( const char* address, int port, int read_delay )
   : m_buffer(read_delay)
 {
-  init(&m_buffer);
+  this->init(&m_buffer);
   open(address, port);
 } // basic_socket_stream::basic_socket_stream()
 
--- libclaw-1.7.0.orig/claw/impl/basic_socketbuf.tpp
+++ libclaw-1.7.0/claw/impl/basic_socketbuf.tpp
@@ -178,7 +178,7 @@
 		       length, 0 );
 
   if ( write_count >= 0 )
-    setp( m_output_buffer, m_output_buffer + m_output_buffer_size );
+    this->setp( m_output_buffer, m_output_buffer + m_output_buffer_size );
   else
     result = -1;
 
@@ -214,11 +214,11 @@
 
   if ( read_count > 0 )
     {
-      setg( m_input_buffer, m_input_buffer, m_input_buffer + read_count);
+      this->setg( m_input_buffer, m_input_buffer, m_input_buffer + read_count);
       result = this->sgetc();
     }
   else
-    setg( m_input_buffer, m_input_buffer + m_input_buffer_size,
+    this->setg( m_input_buffer, m_input_buffer + m_input_buffer_size,
           m_input_buffer + m_input_buffer_size );
 
   return result;
@@ -243,7 +243,7 @@
       result = traits_type::not_eof(c);
 
       if ( !traits_type::eq_int_type(c, traits_type::eof()) )
-        sputc(c);
+        this->sputc(c);
     }
 
   return result;