Merge commit 'd361e123c6642006deb4ec4127a5ff1b28d7dd74' into feat-refactor

boost/boost/timer/config.hpp

@@ -47,7 +47,23 @@
 // And include the header that does the work:
 //
 #include <boost/config/auto_link.hpp>
+
+// We also need to autolink to the Chrono library; even though
+// it's not used in the interface, and no Chrono header is included,
+// it's used in the implementation and is necessary in order to link
+
+#if !defined(BOOST_CHRONO_NO_LIB)
+
+#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CHRONO_DYN_LINK)
+#  define BOOST_DYN_LINK
+#endif
+
+#define BOOST_LIB_NAME boost_chrono
+
+#include <boost/config/auto_link.hpp>
+
+#endif // !defined(BOOST_CHRONO_NO_LIB)
+
 #endif  // auto-linking disabled
 
 #endif // BOOST_TIMER_CONFIG_HPP
-

boost/boost/timer/timer.hpp

@@ -11,7 +11,6 @@
 #include <boost/config/warning_disable.hpp>
 
 #include <boost/timer/config.hpp>
-//#include <boost/chrono/chrono.hpp>
 #include <boost/cstdint.hpp>
 #include <string>
 #include <cstring>
@@ -41,7 +40,7 @@ namespace timer
     nanosecond_type user;
     nanosecond_type system;
 
-    void clear() { wall = user = system = 0LL; }
+    void clear() { wall = user = system = 0; }
   };
       
   const short         default_places = 6;