mesos git commit: Removed a no longer needed function disambiguation.

[bm...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 09429d96c -> 0fb5faf66


Removed a no longer needed function disambiguation.

It appears that with the compiler versions we now support, this
disambiguation is no longer necessary.

Review: https://reviews.apache.org/r/50853/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0fb5faf6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0fb5faf6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0fb5faf6

Branch: refs/heads/master
Commit: 0fb5faf667afebf236e6f6b264ffd15bdcff2726
Parents: 09429d9
Author: Gast�n Kleiman <ga...@mesosphere.com>
Authored: Wed Aug 24 15:04:54 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Wed Aug 24 15:04:54 2016 -0700

----------------------------------------------------------------------
 src/master/master.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/0fb5faf6/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index c300e1f..789fb97 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -1717,14 +1717,10 @@ void Master::recoveredSlavesTimeout(const Registry& registry)
       acquire = slaves.limiter.get()->acquire();
     }
 
-    // Need to disambiguate for the compiler.
-    // TODO(bmahler): With C++11, just call removeSlave from within
-    // a lambda function to avoid the need to disambiguate.
-    Nothing (Master::*removeSlave)(const Registry::Slave&) = &Self::removeSlave;
     const string failure = "Agent removal rate limit acquisition failed";
 
     acquire
-      .then(defer(self(), removeSlave, slave))
+      .then(defer(self(), &Self::removeSlave, slave))
       .onFailed(lambda::bind(fail, failure, lambda::_1))
       .onDiscarded(lambda::bind(fail, failure, "discarded"));