Removed namespace ambiguity in http_tests.cpp. Review: https://reviews.apache.org/r/37328
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/437e7018 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/437e7018 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/437e7018 Branch: refs/heads/master Commit: 437e7018e184128c9ec7c4113da09bbf9914721f Parents: 69704a2 Author: Anand Mazumdar <[email protected]> Authored: Wed Aug 12 23:31:04 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Wed Aug 12 23:31:04 2015 -0700 ---------------------------------------------------------------------- src/tests/common/http_tests.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/437e7018/src/tests/common/http_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/common/http_tests.cpp b/src/tests/common/http_tests.cpp index 38d062b..bf8712b 100644 --- a/src/tests/common/http_tests.cpp +++ b/src/tests/common/http_tests.cpp @@ -32,11 +32,13 @@ #include "messages/messages.hpp" -using std::vector; - using namespace mesos; using namespace mesos::internal; +using std::vector; + +using mesos::internal::protobuf::createTask; + // TODO(bmahler): Add tests for other JSON models. // This test ensures we don't break the API when it comes to JSON @@ -75,7 +77,7 @@ TEST(HTTPTest, ModelTask) task.mutable_slave_id()->CopyFrom(slaveId); task.mutable_command()->set_value("echo hello"); - Task task_ = protobuf::createTask(task, state, frameworkId); + Task task_ = createTask(task, state, frameworkId); task_.add_statuses()->CopyFrom(statuses[0]); JSON::Value object = model(task, frameworkId, state, statuses);
