From 329ed1bdde964c3e63231e3dbd632096b2e6bb5c Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 21 Jul 2013 05:05:00 +0000
Subject: [PATCH] moved declaration of time_now() into time.hpp

---
 include/libtorrent/ptime.hpp | 8 --------
 include/libtorrent/time.hpp  | 2 ++
 src/kademlia/logging.cpp     | 1 +
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/libtorrent/ptime.hpp b/include/libtorrent/ptime.hpp
index 434d4ccc9..e23c74dd4 100644
--- a/include/libtorrent/ptime.hpp
+++ b/include/libtorrent/ptime.hpp
@@ -124,13 +124,5 @@ namespace libtorrent
 
 #endif // TORRENT_USE_BOOST_DATE_TIME
 
-namespace libtorrent
-{
-	char const* time_now_string();
-	std::string log_time();
-
-	TORRENT_EXPORT ptime const& time_now();
-}
-
 #endif
 
diff --git a/include/libtorrent/time.hpp b/include/libtorrent/time.hpp
index c25fa7f29..a21888933 100644
--- a/include/libtorrent/time.hpp
+++ b/include/libtorrent/time.hpp
@@ -44,7 +44,9 @@ namespace libtorrent
 	char const* time_now_string();
 	std::string log_time();
 
+	TORRENT_EXPORT ptime const& time_now();
 	TORRENT_EXPORT ptime time_now_hires();
+
 	TORRENT_EXPORT ptime min_time();
 	TORRENT_EXPORT ptime max_time();
 
diff --git a/src/kademlia/logging.cpp b/src/kademlia/logging.cpp
index 0300bebc3..8034103d4 100644
--- a/src/kademlia/logging.cpp
+++ b/src/kademlia/logging.cpp
@@ -31,6 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "libtorrent/kademlia/logging.hpp"
+#include "libtorrent/time.hpp"
 
 namespace libtorrent { namespace dht
 {