Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: require boost.thread v3

Browse Source
This commit is contained in:
Andrzej Rybczak
2013-07-11 03:20:01 +02:00
parent 1731ee2d38
commit fb9df0caee
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@@ -146,9 +146,9 @@ AC_CHECK_LIB(boost_regex$BOOST_LIB_SUFFIX, main, LDFLAGS="$LDFLAGS -lboost_regex
dnl ============================= dnl =============================
dnl = checking for boost.thread = dnl = checking for boost.thread =
dnl ============================= dnl =============================
CPPFLAGS="$CPPFLAGS -DBOOST_THREAD_VERSION=2" AC_DEFINE([BOOST_THREAD_VERSION], [3], [require boost.thread v3])
AC_CHECK_HEADERS([boost/thread.hpp], , 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_CHECK_LIB(boost_thread$BOOST_LIB_SUFFIX, main, LDFLAGS="$LDFLAGS -lboost_thread$BOOST_LIB_SUFFIX",
AC_MSG_ERROR([no boost.thread library found]) AC_MSG_ERROR([no boost.thread library found])

2
src/lastfm.cpp
View File

@@ -84,7 +84,7 @@ void Lastfm::getResult()
w.flush(); w.flush();
w.refresh(); w.refresh();
// reset m_worker so it's no longer valid // reset m_worker so it's no longer valid
m_worker = boost::unique_future<LastFm::Service::Result>(); m_worker = boost::future<LastFm::Service::Result>();
} }
#endif // HVAE_CURL_CURL_H #endif // HVAE_CURL_CURL_H

2
src/lastfm.h
View File

@@ -82,7 +82,7 @@ private:
std::wstring m_title; std::wstring m_title;
std::shared_ptr<LastFm::Service> m_service; std::shared_ptr<LastFm::Service> m_service;
boost::unique_future<LastFm::Service::Result> m_worker; boost::future<LastFm::Service::Result> m_worker;
}; };
extern Lastfm *myLastfm; extern Lastfm *myLastfm;