Removed cruft

dlib/http_client/http_client.cpp

@@ -15,7 +15,7 @@
 namespace dlib
 {
 
-    typedef dlib::shared_ptr< dlib::timeout::kernel_1a > timeout_ptr;
+    typedef dlib::shared_ptr<dlib::timeout> timeout_ptr;
 
 
 #ifdef _MSC_VER
@@ -564,7 +564,7 @@ namespace dlib
             // Implement a timeout
             timeout_ptr t;
             if ( timeout > 0 )
-                t.reset( new dlib::timeout::kernel_1a(*conn, &dlib::connection::shutdown, timeout) );
+                t.reset( new dlib::timeout(*conn, &dlib::connection::shutdown, timeout) );
 
             // Write our request
             conn->write(request_build.c_str(), static_cast<long>(request_build.size()));
@@ -577,7 +577,7 @@ namespace dlib
             bool read_headers(true);
 
             if ( timeout > 0 )
-                t.reset( new dlib::timeout::kernel_1a(*conn, &dlib::connection::shutdown, timeout) );
+                t.reset( new dlib::timeout(*conn, &dlib::connection::shutdown, timeout) );
 
             while ( (bytes_read = conn->read(buf, 512)) > 0 )
             {
@@ -694,7 +694,7 @@ namespace dlib
                 }
 
                 if ( timeout > 0 )
-                    t.reset( new dlib::timeout::kernel_1a(*conn, &dlib::connection::shutdown, timeout) );
+                    t.reset( new dlib::timeout(*conn, &dlib::connection::shutdown, timeout) );
             } // while still data to read
 
             t.reset();

dlib/iosockstream/iosockstream.h

@@ -78,7 +78,7 @@ namespace dlib
             {
                 if (buf)
                 {
-                    timeout::kernel_1a t(*con,&connection::shutdown,timeout);
+                    dlib::timeout t(*con,&connection::shutdown,timeout);
 
                     // This will flush the sockstreambuf and also destroy it.
                     buf.reset();
@@ -110,7 +110,7 @@ namespace dlib
         {
             if (con)
             {
-                con_timeout.reset(new timeout::kernel_1a(*this,&iosockstream::terminate_connection,timeout,con));
+                con_timeout.reset(new dlib::timeout(*this,&iosockstream::terminate_connection,timeout,con));
             }
         }
 
@@ -123,7 +123,7 @@ namespace dlib
             thecon->shutdown();
         }
 
-        scoped_ptr<timeout::kernel_1a> con_timeout;
+        scoped_ptr<timeout> con_timeout;
         shared_ptr_thread_safe<connection> con;
         scoped_ptr<sockstreambuf> buf;
 

dlib/sockets/sockets_extensions.cpp

@@ -316,7 +316,7 @@ namespace dlib
 
         try
         {
-            timeout::kernel_1a t(*con,&connection::shutdown,timeout);
+            dlib::timeout t(*con,&connection::shutdown,timeout);
 
             char junk[100];
             // wait for the other end to close their side