Commit 1a0fc96a authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[master] added boost:: for its version of bind().

as suggested in #2084.  not sure why 'using namespace bind' didn't work
(and the signature is so special that there wouldn't be ambiguity)
but in any case this namespace is too large so it's better to not try to
specify the entire space.
with this change we don't need to declare using the entire space, so I
removed it, too.
okayed on jabber, directly committing.
parent c6385a4f
......@@ -33,7 +33,6 @@ using namespace isc::data;
using namespace isc::config;
using namespace isc::cc;
using namespace std;
using namespace boost;
namespace {
std::string
......@@ -52,6 +51,7 @@ protected:
root_name(isc::log::getRootLoggerName())
{
// upon creation of a ModuleCCSession, the class
// sends its specification to the config manager.
// it expects an ok answer back, so everytime we
// create a ModuleCCSession, we must set an initial
......@@ -740,8 +740,9 @@ protected:
registerCommand(const string& recipient)
{
return (mccs_.groupRecvMsgAsync(
bind(&AsyncReceiveCCSessionTest::callback, this, next_flag_ ++, _1,
_2, _3), false, -1, recipient));
boost::bind(&AsyncReceiveCCSessionTest::callback, this,
next_flag_++, _1, _2, _3), false, -1,
recipient));
}
/// \brief Convenience function to queue a request to get a reply
/// message.
......@@ -749,8 +750,8 @@ protected:
registerReply(int seq)
{
return (mccs_.groupRecvMsgAsync(
bind(&AsyncReceiveCCSessionTest::callback, this, next_flag_ ++, _1,
_2, _3), true, seq));
boost::bind(&AsyncReceiveCCSessionTest::callback, this,
next_flag_++, _1, _2, _3), true, seq));
}
/// \brief Check the next called callback was with this flag
void called(int flag) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment