Index: source/tools/atlas/AtlasUI/General/Observable.h =================================================================== --- source/tools/atlas/AtlasUI/General/Observable.h +++ source/tools/atlas/AtlasUI/General/Observable.h @@ -39,15 +39,9 @@ */ -#include -#include -#if BOOST_VERSION >= 104000 -# include +#include typedef boost::signals2::connection ObservableConnection; typedef boost::signals2::scoped_connection ObservableScopedConnection; -#else -# error Atlas requires Boost 1.40 or later -#endif template class Observable : public T { @@ -63,7 +57,7 @@ template ObservableConnection RegisterObserver(int order, void (C::*callback) (const T&), C* obj) { - return m_Signal.connect(order, boost::bind(std::mem_fun(callback), obj, _1)); + return m_Signal.connect(order, std::bind(std::mem_fn(callback), obj, std::placeholders::_1)); } ObservableConnection RegisterObserver(int order, void (*callback) (const T&)) @@ -135,7 +129,7 @@ template ObservableConnection RegisterObserver(int order, void (C::*callback) (T*), C* obj) { - return m_Signal.connect(order, boost::bind(std::mem_fun(callback), obj, _1)); + return m_Signal.connect(order, std::bind(std::mem_fn(callback), obj, std::placeholders::_1)); } ObservableConnection RegisterObserver(int order, void (*callback) (T*)) Index: source/tools/atlas/AtlasUI/General/Observable.cpp =================================================================== --- source/tools/atlas/AtlasUI/General/Observable.cpp +++ source/tools/atlas/AtlasUI/General/Observable.cpp @@ -23,8 +23,8 @@ { // Clean up any disconnected connections that might be left in here m_Conns.erase( - remove_if(m_Conns.begin(), m_Conns.end(), - not1(std::mem_fun_ref(&ObservableConnection::connected))), + std::remove_if(m_Conns.begin(), m_Conns.end(), + std::not_fn(std::mem_fn(&ObservableConnection::connected))), m_Conns.end() ); @@ -35,5 +35,5 @@ ObservableScopedConnections::~ObservableScopedConnections() { // Disconnect all connections that we hold - for_each(m_Conns.begin(), m_Conns.end(), std::mem_fun_ref(&ObservableConnection::disconnect)); + for_each(m_Conns.begin(), m_Conns.end(), std::mem_fn(&ObservableConnection::disconnect)); }