You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/07/05 14:40:45 UTC
mesos git commit: Tightened namespace to fix a lookup error on
Windows.
Repository: mesos
Updated Branches:
refs/heads/master 2617482f0 -> 013f7e21a
Tightened namespace to fix a lookup error on Windows.
The Visual C++ compiler tried to lookup 'protobuf::parse' in the
'mesos::internal::protobuf' namespace. This is fixed by explicitly
setting the namespace.
Review: https://reviews.apache.org/r/60653/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/013f7e21
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/013f7e21
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/013f7e21
Branch: refs/heads/master
Commit: 013f7e21ac2c8872668e6e0fad35a1b7b92ec796
Parents: 2617482
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Wed Jul 5 16:40:16 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Jul 5 16:40:16 2017 +0200
----------------------------------------------------------------------
src/resource_provider/daemon.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/013f7e21/src/resource_provider/daemon.cpp
----------------------------------------------------------------------
diff --git a/src/resource_provider/daemon.cpp b/src/resource_provider/daemon.cpp
index 243396d..adcb60a 100644
--- a/src/resource_provider/daemon.cpp
+++ b/src/resource_provider/daemon.cpp
@@ -127,7 +127,7 @@ Try<Nothing> LocalResourceProviderDaemonProcess::load(const string& path)
}
Try<ResourceProviderInfo> info =
- protobuf::parse<ResourceProviderInfo>(json.get());
+ ::protobuf::parse<ResourceProviderInfo>(json.get());
if (info.isError()) {
return Error("Not a valid resource provider config: " + info.error());