Permalink
Browse files

Merge pull request #7065

3522f49 http: add Boost 1.49 compatibility (Wladimir J. van der Laan)
  • Loading branch information...
laanwj committed Nov 24, 2015
2 parents 0b0fc17 + 3522f49 commit f91e29fd4d0e62519d413f27c8547c9f5245f8e8
Showing with 4 additions and 0 deletions.
  1. +4 −0 src/httpserver.cpp
View
@@ -487,7 +487,11 @@ void StopHTTPServer()
// master that appears to be solved, so in the future that solution
// could be used again (if desirable).
// (see discussion in https://github.com/bitcoin/bitcoin/pull/6990)
+#if BOOST_VERSION >= 105000
if (!threadHTTP.try_join_for(boost::chrono::milliseconds(2000))) {
+#else
+ if (!threadHTTP.timed_join(boost::posix_time::milliseconds(2000))) {
+#endif
LogPrintf("HTTP event loop did not exit within allotted time, sending loopbreak\n");
event_base_loopbreak(eventBase);
threadHTTP.join();

0 comments on commit f91e29f

Please sign in to comment.