Fully qualified some variables to support precompiled headers. Precompiled headers often include headers that were not otherwise included in a source file. If two headers have the same class name (with different scoping), this sometimes causes a name resolution conflict.
This commit deals with the name resolution conflicts that arise on Windows due to enabling precompiled headers. Review: https://reviews.apache.org/r/58012/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7de8684f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7de8684f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7de8684f Branch: refs/heads/master Commit: 7de8684f01bc7137a130a9cbc75ea9840ca70cb5 Parents: 499ffe0 Author: Jeff Coffler <[email protected]> Authored: Wed Mar 29 11:00:44 2017 -0700 Committer: Joseph Wu <[email protected]> Committed: Wed Mar 29 13:38:21 2017 -0700 ---------------------------------------------------------------------- src/internal/evolve.cpp | 8 ++++---- src/slave/containerizer/docker.cpp | 8 ++++---- src/slave/windows_ctrlhandler.hpp | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/7de8684f/src/internal/evolve.cpp ---------------------------------------------------------------------- diff --git a/src/internal/evolve.cpp b/src/internal/evolve.cpp index 5ef2306..93196f3 100644 --- a/src/internal/evolve.cpp +++ b/src/internal/evolve.cpp @@ -593,7 +593,7 @@ v1::master::Response evolve<v1::master::Response::GET_VERSION>( v1::master::Response response; response.set_type(v1::master::Response::GET_VERSION); - Try<v1::VersionInfo> version = protobuf::parse<v1::VersionInfo>(object); + Try<v1::VersionInfo> version = ::protobuf::parse<v1::VersionInfo>(object); CHECK_SOME(version); response.mutable_get_version()->mutable_version_info()->CopyFrom( @@ -611,7 +611,7 @@ v1::agent::Response evolve<v1::agent::Response::GET_VERSION>( v1::agent::Response response; response.set_type(v1::agent::Response::GET_VERSION); - Try<v1::VersionInfo> version = protobuf::parse<v1::VersionInfo>(object); + Try<v1::VersionInfo> version = ::protobuf::parse<v1::VersionInfo>(object); CHECK_SOME(version); response.mutable_get_version()->mutable_version_info()->CopyFrom( @@ -660,7 +660,7 @@ v1::agent::Response evolve<v1::agent::Response::GET_CONTAINERS>( Result<JSON::Object> container_status = object.find<JSON::Object>("status"); if (container_status.isSome()) { Try<v1::ContainerStatus> status = - protobuf::parse<v1::ContainerStatus>(container_status.get()); + ::protobuf::parse<v1::ContainerStatus>(container_status.get()); CHECK_SOME(status); container->mutable_container_status()->CopyFrom(status.get()); @@ -671,7 +671,7 @@ v1::agent::Response evolve<v1::agent::Response::GET_CONTAINERS>( if (resource_statistics.isSome()) { Try<v1::ResourceStatistics> statistics = - protobuf::parse<v1::ResourceStatistics>(resource_statistics.get()); + ::protobuf::parse<v1::ResourceStatistics>(resource_statistics.get()); CHECK_SOME(statistics); container->mutable_resource_statistics()->CopyFrom(statistics.get()); http://git-wip-us.apache.org/repos/asf/mesos/blob/7de8684f/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index dfab262..7951ed1 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -237,13 +237,13 @@ DockerContainerizer::~DockerContainerizer() // // NOTE: `taskEnvironment` is currently used to propagate environment variables // from a hook: `slavePreLaunchDockerEnvironmentDecorator`. -docker::Flags dockerFlags( +::mesos::internal::docker::Flags dockerFlags( const Flags& flags, const string& name, const string& directory, const Option<map<string, string>>& taskEnvironment) { - docker::Flags dockerFlags; + ::mesos::internal::docker::Flags dockerFlags; dockerFlags.container = name; dockerFlags.docker = flags.docker; dockerFlags.sandbox_directory = directory; @@ -363,7 +363,7 @@ DockerContainerizerProcess::Container::create( // NOTE: We do not set the optional `taskEnvironment` here as // this field is currently used to propagate environment variables // from a hook. This hook is called after `Container::create`. - docker::Flags dockerExecutorFlags = dockerFlags( + ::mesos::internal::docker::Flags dockerExecutorFlags = dockerFlags( flags, Container::name(slaveId, stringify(id)), containerWorkdir, @@ -1499,7 +1499,7 @@ Future<pid_t> DockerContainerizerProcess::launchExecutorProcess( #endif // __linux__ // Prepare the flags to pass to the mesos docker executor process. - docker::Flags launchFlags = dockerFlags( + ::mesos::internal::docker::Flags launchFlags = dockerFlags( flags, container->name(), container->directory, http://git-wip-us.apache.org/repos/asf/mesos/blob/7de8684f/src/slave/windows_ctrlhandler.hpp ---------------------------------------------------------------------- diff --git a/src/slave/windows_ctrlhandler.hpp b/src/slave/windows_ctrlhandler.hpp index 25b14a4..145a232 100644 --- a/src/slave/windows_ctrlhandler.hpp +++ b/src/slave/windows_ctrlhandler.hpp @@ -24,9 +24,9 @@ namespace internal { // handler should be configured once. Configuring it multiple times will // overwrite any previous handlers. Configuring from multiple threads // simultaneously has undefined behavior. -std::function<void(int, int)>* signaledWrapper = nullptr; +static std::function<void(int, int)>* signaledWrapper = nullptr; -BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) +inline BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) { switch (fdwCtrlType) { // Handle the CTRL-C signal. @@ -47,7 +47,7 @@ BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) } -int installCtrlHandler(const std::function<void(int, int)>* signal) +inline int installCtrlHandler(const std::function<void(int, int)>* signal) { // NOTE: We only expect this function to be called called multiple // times inside tests and `mesos-local`.
