build: boost::placeholders
On Fedora, Boost placeholders are now in their own namespace. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
This commit is contained in:
parent
dc88a596b3
commit
c656bc4a08
|
@ -49,10 +49,10 @@ std::shared_ptr<AutoSyncManager> AutoSyncManager::createAutoSyncManager(Server &
|
||||||
result->init();
|
result->init();
|
||||||
|
|
||||||
// update cached information about a config each time it changes
|
// update cached information about a config each time it changes
|
||||||
server.m_configChangedSignal.connect(Server::ConfigChangedSignal_t::slot_type(&AutoSyncManager::initConfig, result.get(), _1).track_foreign(result));
|
server.m_configChangedSignal.connect(Server::ConfigChangedSignal_t::slot_type(&AutoSyncManager::initConfig, result.get(), boost::placeholders::_1).track_foreign(result));
|
||||||
|
|
||||||
// monitor running sessions
|
// monitor running sessions
|
||||||
server.m_newSyncSessionSignal.connect(Server::NewSyncSessionSignal_t::slot_type(&AutoSyncManager::sessionStarted, result.get(), _1).track_foreign(result));
|
server.m_newSyncSessionSignal.connect(Server::NewSyncSessionSignal_t::slot_type(&AutoSyncManager::sessionStarted, result.get(), boost::placeholders::_1).track_foreign(result));
|
||||||
|
|
||||||
// Keep track of the time when a transport became online. As with
|
// Keep track of the time when a transport became online. As with
|
||||||
// time of last sync, we are pessimistic here and assume that the
|
// time of last sync, we are pessimistic here and assume that the
|
||||||
|
@ -64,13 +64,13 @@ std::shared_ptr<AutoSyncManager> AutoSyncManager::createAutoSyncManager(Server &
|
||||||
}
|
}
|
||||||
p.m_btPresenceSignal.connect(PresenceStatus::PresenceSignal_t::slot_type(updatePresence,
|
p.m_btPresenceSignal.connect(PresenceStatus::PresenceSignal_t::slot_type(updatePresence,
|
||||||
&result->m_btStartTime,
|
&result->m_btStartTime,
|
||||||
_1).track_foreign(result));
|
boost::placeholders::_1).track_foreign(result));
|
||||||
if (p.getHttpPresence()) {
|
if (p.getHttpPresence()) {
|
||||||
result->m_httpStartTime = now;
|
result->m_httpStartTime = now;
|
||||||
}
|
}
|
||||||
p.m_httpPresenceSignal.connect(PresenceStatus::PresenceSignal_t::slot_type(updatePresence,
|
p.m_httpPresenceSignal.connect(PresenceStatus::PresenceSignal_t::slot_type(updatePresence,
|
||||||
&result->m_httpStartTime,
|
&result->m_httpStartTime,
|
||||||
_1).track_foreign(result));
|
boost::placeholders::_1).track_foreign(result));
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -404,7 +404,7 @@ void AutoSyncManager::sessionStarted(const std::shared_ptr<Session> &session)
|
||||||
task->m_lastSyncTime = Timespec::monotonic();
|
task->m_lastSyncTime = Timespec::monotonic();
|
||||||
|
|
||||||
// track permanent failure
|
// track permanent failure
|
||||||
session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(&AutoSyncManager::anySyncDone, this, task.get(), _1).track_foreign(task).track_foreign(me));
|
session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(&AutoSyncManager::anySyncDone, this, task.get(), boost::placeholders::_1).track_foreign(task).track_foreign(me));
|
||||||
|
|
||||||
if (m_session == session) {
|
if (m_session == session) {
|
||||||
// Only for our own auto sync session: notify user once session starts successful.
|
// Only for our own auto sync session: notify user once session starts successful.
|
||||||
|
@ -416,7 +416,7 @@ void AutoSyncManager::sessionStarted(const std::shared_ptr<Session> &session)
|
||||||
|
|
||||||
// Notify user once session ends, with or without failure.
|
// Notify user once session ends, with or without failure.
|
||||||
// Same instance tracking as for sync success start.
|
// Same instance tracking as for sync success start.
|
||||||
session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(&AutoSyncManager::autoSyncDone, this, task.get(), _1).track_foreign(task).track_foreign(me));
|
session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(&AutoSyncManager::autoSyncDone, this, task.get(), boost::placeholders::_1).track_foreign(task).track_foreign(me));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -120,11 +120,11 @@ std::shared_ptr<TransportAgent> DBusSync::createTransportAgent()
|
||||||
// away at any time, so use instance tracking.
|
// away at any time, so use instance tracking.
|
||||||
m_helper.m_messageSignal.connect(SessionHelper::MessageSignal_t::slot_type(&DBusTransportAgent::storeMessage,
|
m_helper.m_messageSignal.connect(SessionHelper::MessageSignal_t::slot_type(&DBusTransportAgent::storeMessage,
|
||||||
agent.get(),
|
agent.get(),
|
||||||
_1,
|
boost::placeholders::_1,
|
||||||
_2).track_foreign(agent));
|
boost::placeholders::_2).track_foreign(agent));
|
||||||
m_helper.m_connectionStateSignal.connect(SessionHelper::ConnectionStateSignal_t::slot_type(&DBusTransportAgent::storeState,
|
m_helper.m_connectionStateSignal.connect(SessionHelper::ConnectionStateSignal_t::slot_type(&DBusTransportAgent::storeState,
|
||||||
agent.get(),
|
agent.get(),
|
||||||
_1).track_foreign(agent));
|
boost::placeholders::_1).track_foreign(agent));
|
||||||
|
|
||||||
if (m_params.m_serverAlerted) {
|
if (m_params.m_serverAlerted) {
|
||||||
// A SAN message was sent to us, need to reply.
|
// A SAN message was sent to us, need to reply.
|
||||||
|
|
|
@ -460,10 +460,10 @@ void Session::sync2(const std::string &mode, const SessionCommon::SourceModes_t
|
||||||
if (connection) {
|
if (connection) {
|
||||||
connection->m_messageSignal.connect(Connection::MessageSignal_t::slot_type(&Session::storeMessage,
|
connection->m_messageSignal.connect(Connection::MessageSignal_t::slot_type(&Session::storeMessage,
|
||||||
this,
|
this,
|
||||||
_1, _2).track_foreign(weak_from_this()));
|
boost::placeholders::_1, boost::placeholders::_2).track_foreign(weak_from_this()));
|
||||||
connection->m_statusSignal.connect(Connection::StatusSignal_t::slot_type(&Session::connectionState,
|
connection->m_statusSignal.connect(Connection::StatusSignal_t::slot_type(&Session::connectionState,
|
||||||
this,
|
this,
|
||||||
_1).track_foreign(weak_from_this()));
|
boost::placeholders::_1).track_foreign(weak_from_this()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper implements Sync() asynchronously. If it completes
|
// Helper implements Sync() asynchronously. If it completes
|
||||||
|
|
|
@ -1649,7 +1649,7 @@ static void InitializeTransport(const std::shared_ptr<TransportAgent> &agent,
|
||||||
// is detected. Relies of automatic connection management
|
// is detected. Relies of automatic connection management
|
||||||
// to disconnect when agent is deconstructed.
|
// to disconnect when agent is deconstructed.
|
||||||
SuspendFlags &flags(SuspendFlags::getSuspendFlags());
|
SuspendFlags &flags(SuspendFlags::getSuspendFlags());
|
||||||
flags.m_stateChanged.connect(SuspendFlags::StateChanged_t::slot_type(CancelTransport, agent.get(), _1).track_foreign(agent));
|
flags.m_stateChanged.connect(SuspendFlags::StateChanged_t::slot_type(CancelTransport, agent.get(), boost::placeholders::_1).track_foreign(agent));
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<TransportAgent> SyncContext::createTransportAgent(void *gmainloop)
|
std::shared_ptr<TransportAgent> SyncContext::createTransportAgent(void *gmainloop)
|
||||||
|
|
|
@ -684,7 +684,7 @@ bool RemoteDBusServer::execute(const std::vector<std::string> &args, const std::
|
||||||
// react in the normal event loop.
|
// react in the normal event loop.
|
||||||
SuspendFlags &flags(SuspendFlags::getSuspendFlags());
|
SuspendFlags &flags(SuspendFlags::getSuspendFlags());
|
||||||
std::shared_ptr<SuspendFlags::Guard> signalGuard = flags.activate();
|
std::shared_ptr<SuspendFlags::Guard> signalGuard = flags.activate();
|
||||||
flags.m_stateChanged.connect(SuspendFlags::StateChanged_t::slot_type(SuspendFlagsChanged, m_session.get(), _1).track_foreign(m_session));
|
flags.m_stateChanged.connect(SuspendFlags::StateChanged_t::slot_type(SuspendFlagsChanged, m_session.get(), boost::placeholders::_1).track_foreign(m_session));
|
||||||
|
|
||||||
//wait until status is 'done'
|
//wait until status is 'done'
|
||||||
while(m_result && !m_session->statusDone()) {
|
while(m_result && !m_session->statusDone()) {
|
||||||
|
|
|
@ -182,7 +182,7 @@ static void callServer(const GDBusCXX::DBusConnectionPtr &conn)
|
||||||
std::cout << "Got tuple: " << std::get<0>(result) << " " << std::get<1>(result) << " " << std::get<2>(result) << std::endl;
|
std::cout << "Got tuple: " << std::get<0>(result) << " " << std::get<1>(result) << " " << std::get<2>(result) << std::endl;
|
||||||
|
|
||||||
std::cout << "calling server" << std::endl;
|
std::cout << "calling server" << std::endl;
|
||||||
proxy.m_hello.start(boost::bind(helloCB, loop.get(), _1, _2), std::string("world"));
|
proxy.m_hello.start(boost::bind(helloCB, loop.get(), boost::placeholders::_1, boost::placeholders::_2), std::string("world"));
|
||||||
// keep connection open until child quits
|
// keep connection open until child quits
|
||||||
guard.reset(new GDBusCXX::DBusObject(conn, "foo", "bar", true));
|
guard.reset(new GDBusCXX::DBusObject(conn, "foo", "bar", true));
|
||||||
}
|
}
|
||||||
|
@ -284,16 +284,16 @@ int main(int argc, char **argv)
|
||||||
forkexec->addEnvVar("DBUS_CLIENT_SERVER_KILL", opt_kill);
|
forkexec->addEnvVar("DBUS_CLIENT_SERVER_KILL", opt_kill);
|
||||||
}
|
}
|
||||||
forkexec->m_onConnect.connect(g_strcmp0(opt_kill, "child") ?
|
forkexec->m_onConnect.connect(g_strcmp0(opt_kill, "child") ?
|
||||||
boost::bind(onChildConnect, _1, boost::ref(testptr)) :
|
boost::bind(onChildConnect, boost::placeholders::_1, boost::ref(testptr)) :
|
||||||
boost::bind(onChildConnectKill, _1, boost::ref(testptr)));
|
boost::bind(onChildConnectKill, boost::placeholders::_1, boost::ref(testptr)));
|
||||||
forkexec->m_onQuit.connect(onQuit);
|
forkexec->m_onQuit.connect(onQuit);
|
||||||
forkexec->m_onFailure.connect(boost::bind(onFailure, _2));
|
forkexec->m_onFailure.connect(boost::bind(onFailure, boost::placeholders::_2));
|
||||||
forkexec->start();
|
forkexec->start();
|
||||||
g_main_loop_run(loop.get());
|
g_main_loop_run(loop.get());
|
||||||
} else if (opt_server) {
|
} else if (opt_server) {
|
||||||
boost::scoped_ptr<Test> testptr;
|
boost::scoped_ptr<Test> testptr;
|
||||||
std::shared_ptr<GDBusCXX::DBusServerCXX> server =
|
std::shared_ptr<GDBusCXX::DBusServerCXX> server =
|
||||||
GDBusCXX::DBusServerCXX::listen(boost::bind(newClientConnection, _1, _2, boost::ref(testptr)),
|
GDBusCXX::DBusServerCXX::listen(boost::bind(newClientConnection, boost::placeholders::_1, boost::placeholders::_2, boost::ref(testptr)),
|
||||||
&dbusError);
|
&dbusError);
|
||||||
if (!server) {
|
if (!server) {
|
||||||
dbusError.throwFailure("starting server");
|
dbusError.throwFailure("starting server");
|
||||||
|
@ -307,7 +307,7 @@ int main(int argc, char **argv)
|
||||||
forkexec->m_onConnect.connect(!g_strcmp0(getenv("DBUS_CLIENT_SERVER_KILL"), "child") ? calledByServer :
|
forkexec->m_onConnect.connect(!g_strcmp0(getenv("DBUS_CLIENT_SERVER_KILL"), "child") ? calledByServer :
|
||||||
!g_strcmp0(getenv("DBUS_CLIENT_SERVER_KILL"), "server") ? killServer :
|
!g_strcmp0(getenv("DBUS_CLIENT_SERVER_KILL"), "server") ? killServer :
|
||||||
callServer);
|
callServer);
|
||||||
forkexec->m_onFailure.connect(boost::bind(onFailure, _2));
|
forkexec->m_onFailure.connect(boost::bind(onFailure, boost::placeholders::_2));
|
||||||
forkexec->connect();
|
forkexec->connect();
|
||||||
g_main_loop_run(loop.get());
|
g_main_loop_run(loop.get());
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue