aboutsummaryrefslogtreecommitdiff
path: root/src/util.h
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-03-11 22:21:06 -0400
committerLuke Dashjr <luke-jr+git@utopios.org>2012-03-11 22:21:06 -0400
commitd05c03ab4ed23389b1326f9b7c77a8d7b8d6588d (patch)
treec402523f1548781a1437a1e409b0ca8c7ae7ebf4 /src/util.h
parent9cf600e6dabe9133a0c25e87babc42e3a0e1a29a (diff)
parentb4f8c8f5f9ff0f8db6612d7f279976453b18876f (diff)
downloadbitcoin-d05c03ab4ed23389b1326f9b7c77a8d7b8d6588d.tar.xz
Merge branch '0.5.0.x' into 0.5.xv0.5.3rc4v0.5.3
Diffstat (limited to 'src/util.h')
-rw-r--r--src/util.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/util.h b/src/util.h
index 15a45ba7d7..45b14420f1 100644
--- a/src/util.h
+++ b/src/util.h
@@ -115,7 +115,9 @@ typedef u_int SOCKET;
#define Beep(n1,n2) (0)
inline void Sleep(int64 n)
{
- boost::thread::sleep(boost::get_system_time() + boost::posix_time::milliseconds(n));
+ /*Boost has a year 2038 problem— if the request sleep time is past epoch+2^31 seconds the sleep returns instantly.
+ So we clamp our sleeps here to 10 years and hope that boost is fixed by 2028.*/
+ boost::thread::sleep(boost::get_system_time() + boost::posix_time::milliseconds(n>315576000000LL?315576000000LL:n));
}
#endif