Make SSL support work when the Boost.DateTime library is disabled.

chriskohlhoff · chriskohlhoff · commit c141df77ab90 · 2012-05-29T20:11:30.000+10:00
diff --git a/asio/include/asio/ssl/detail/io.hpp b/asio/include/asio/ssl/detail/io.hpp
@@ -148,10 +148,10 @@ class io_op
           // cannot allow more than one read operation at a time on the
           // underlying transport. The pending_read_ timer's expiry is set to
           // pos_infin if a read is in progress, and neg_infin otherwise.
-          if (core_.pending_read_.expires_at() == boost::posix_time::neg_infin)
+          if (core_.pending_read_.expires_at() == core_.neg_infin())
           {
             // Prevent other read operations from being started.
-            core_.pending_read_.expires_at(boost::posix_time::pos_infin);
+            core_.pending_read_.expires_at(core_.pos_infin());
 
             // Start reading some data from the underlying transport.
             next_layer_.async_read_some(
@@ -175,10 +175,10 @@ class io_op
           // cannot allow more than one write operation at a time on the
           // underlying transport. The pending_write_ timer's expiry is set to
           // pos_infin if a write is in progress, and neg_infin otherwise.
-          if (core_.pending_write_.expires_at() == boost::posix_time::neg_infin)
+          if (core_.pending_write_.expires_at() == core_.neg_infin())
           {
             // Prevent other write operations from being started.
-            core_.pending_write_.expires_at(boost::posix_time::pos_infin);
+            core_.pending_write_.expires_at(core_.pos_infin());
 
             // Start writing all the data to the underlying transport.
             asio::async_write(next_layer_,
@@ -233,23 +233,23 @@ class io_op
           core_.input_ = core_.engine_.put_input(core_.input_);
 
           // Release any waiting read operations.
-          core_.pending_read_.expires_at(boost::posix_time::neg_infin);
+          core_.pending_read_.expires_at(core_.neg_infin());
 
           // Try the operation again.
           continue;
 
         case engine::want_output_and_retry:
 
           // Release any waiting write operations.
-          core_.pending_write_.expires_at(boost::posix_time::neg_infin);
+          core_.pending_write_.expires_at(core_.neg_infin());
 
           // Try the operation again.
           continue;
 
         case engine::want_output:
 
           // Release any waiting write operations.
-          core_.pending_write_.expires_at(boost::posix_time::neg_infin);
+          core_.pending_write_.expires_at(core_.neg_infin());
 
           // Fall through to call handler.
 
diff --git a/asio/include/asio/ssl/detail/stream_core.hpp b/asio/include/asio/ssl/detail/stream_core.hpp
@@ -18,7 +18,11 @@
 #include "asio/detail/config.hpp"
 
 #if !defined(ASIO_ENABLE_OLD_SSL)
-# include "asio/deadline_timer.hpp"
+# if defined(ASIO_HAS_BOOST_DATE_TIME)
+#  include "asio/deadline_timer.hpp"
+# else // defined(ASIO_HAS_BOOST_DATE_TIME)
+#  include "asio/steady_timer.hpp"
+# endif // defined(ASIO_HAS_BOOST_DATE_TIME)
 # include "asio/ssl/detail/engine.hpp"
 # include "asio/buffer.hpp"
 #endif // !defined(ASIO_ENABLE_OLD_SSL)
@@ -46,8 +50,8 @@ struct stream_core
       input_buffer_space_(max_tls_record_size),
       input_buffer_(asio::buffer(input_buffer_space_))
   {
-    pending_read_.expires_at(boost::posix_time::neg_infin);
-    pending_write_.expires_at(boost::posix_time::neg_infin);
+    pending_read_.expires_at(neg_infin());
+    pending_write_.expires_at(neg_infin());
   }
 
   ~stream_core()
@@ -57,12 +61,44 @@ struct stream_core
   // The SSL engine.
   engine engine_;
 
+#if defined(ASIO_HAS_BOOST_DATE_TIME)
   // Timer used for storing queued read operations.
   asio::deadline_timer pending_read_;
 
   // Timer used for storing queued write operations.
   asio::deadline_timer pending_write_;
 
+  // Helper function for obtaining a time value that always fires.
+  static asio::deadline_timer::time_type neg_infin()
+  {
+    return boost::posix_time::neg_infin;
+  }
+
+  // Helper function for obtaining a time value that never fires.
+  static asio::deadline_timer::time_type pos_infin()
+  {
+    return boost::posix_time::pos_infin;
+  }
+#else // defined(ASIO_HAS_BOOST_DATE_TIME)
+  // Timer used for storing queued read operations.
+  asio::steady_timer pending_read_;
+
+  // Timer used for storing queued write operations.
+  asio::steady_timer pending_write_;
+
+  // Helper function for obtaining a time value that always fires.
+  static asio::steady_timer::time_point neg_infin()
+  {
+    return asio::steady_timer::time_point::min();
+  }
+
+  // Helper function for obtaining a time value that never fires.
+  static asio::steady_timer::time_point pos_infin()
+  {
+    return asio::steady_timer::time_point::max();
+  }
+#endif // defined(ASIO_HAS_BOOST_DATE_TIME)
+
   // Buffer space used to prepare output intended for the transport.
   std::vector<unsigned char> output_buffer_space_; 
 
