From fb9df0caee164330322d94df67e3d7c74d2fc9db Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Thu, 11 Jul 2013 03:20:01 +0200 Subject: [PATCH] configure: require boost.thread v3 --- configure.in | 4 ++-- src/lastfm.cpp | 2 +- src/lastfm.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 328619c..aa7d92b 100644 --- a/configure.in +++ b/configure.in @@ -146,9 +146,9 @@ AC_CHECK_LIB(boost_regex$BOOST_LIB_SUFFIX, main, LDFLAGS="$LDFLAGS -lboost_regex dnl ============================= dnl = checking for boost.thread = dnl ============================= -CPPFLAGS="$CPPFLAGS -DBOOST_THREAD_VERSION=2" +AC_DEFINE([BOOST_THREAD_VERSION], [3], [require boost.thread v3]) AC_CHECK_HEADERS([boost/thread.hpp], , - AC_MSG_ERROR([boost/thread.hpp is missing or your boost version is too old (boost.thread v2 is required)]) + AC_MSG_ERROR([boost/thread.hpp is missing or your boost version is too old (boost.thread v3 is required)]) ) AC_CHECK_LIB(boost_thread$BOOST_LIB_SUFFIX, main, LDFLAGS="$LDFLAGS -lboost_thread$BOOST_LIB_SUFFIX", AC_MSG_ERROR([no boost.thread library found]) diff --git a/src/lastfm.cpp b/src/lastfm.cpp index e9baabc..f2fdabe 100644 --- a/src/lastfm.cpp +++ b/src/lastfm.cpp @@ -84,7 +84,7 @@ void Lastfm::getResult() w.flush(); w.refresh(); // reset m_worker so it's no longer valid - m_worker = boost::unique_future(); + m_worker = boost::future(); } #endif // HVAE_CURL_CURL_H diff --git a/src/lastfm.h b/src/lastfm.h index ceda5a7..7126099 100644 --- a/src/lastfm.h +++ b/src/lastfm.h @@ -82,7 +82,7 @@ private: std::wstring m_title; std::shared_ptr m_service; - boost::unique_future m_worker; + boost::future m_worker; }; extern Lastfm *myLastfm; -- 2.11.4.GIT