Cleaned up usage of namespace-qualified identifiers. Review: https://reviews.apache.org/r/58043
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a5b3c49a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a5b3c49a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a5b3c49a Branch: refs/heads/master Commit: a5b3c49a7048a47e8a68b619580ce06fd183a212 Parents: f320294 Author: Neil Conway <[email protected]> Authored: Sat Mar 18 19:58:30 2017 -0700 Committer: Neil Conway <[email protected]> Committed: Mon Apr 3 11:41:13 2017 -0700 ---------------------------------------------------------------------- src/authentication/executor/jwt_secret_generator.cpp | 2 +- src/master/allocator/mesos/hierarchical.cpp | 2 +- src/master/master.cpp | 6 +++--- src/slave/containerizer/composing.cpp | 2 +- .../containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp | 4 ++-- src/slave/containerizer/mesos/linux_launcher.cpp | 6 +++--- src/tests/default_executor_tests.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a5b3c49a/src/authentication/executor/jwt_secret_generator.cpp ---------------------------------------------------------------------- diff --git a/src/authentication/executor/jwt_secret_generator.cpp b/src/authentication/executor/jwt_secret_generator.cpp index 5530a84..1d7c010 100644 --- a/src/authentication/executor/jwt_secret_generator.cpp +++ b/src/authentication/executor/jwt_secret_generator.cpp @@ -35,7 +35,7 @@ using process::http::authentication::Principal; using std::string; -JWTSecretGenerator::JWTSecretGenerator(const std::string& secret) +JWTSecretGenerator::JWTSecretGenerator(const string& secret) : secret_(secret) {} http://git-wip-us.apache.org/repos/asf/mesos/blob/a5b3c49a/src/master/allocator/mesos/hierarchical.cpp ---------------------------------------------------------------------- diff --git a/src/master/allocator/mesos/hierarchical.cpp b/src/master/allocator/mesos/hierarchical.cpp index 8d54a8c..ff9e234 100644 --- a/src/master/allocator/mesos/hierarchical.cpp +++ b/src/master/allocator/mesos/hierarchical.cpp @@ -2214,7 +2214,7 @@ double HierarchicalAllocatorProcess::_offer_filters_active( bool HierarchicalAllocatorProcess::isFrameworkTrackedUnderRole( const FrameworkID& frameworkId, - const std::string& role) const + const string& role) const { return roles.contains(role) && roles.at(role).contains(frameworkId); http://git-wip-us.apache.org/repos/asf/mesos/blob/a5b3c49a/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index a985465..6a6a570 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -382,7 +382,7 @@ struct BoundedRateLimiter }; -bool Framework::isTrackedUnderRole(const std::string& role) const +bool Framework::isTrackedUnderRole(const string& role) const { CHECK(master->isWhitelistedRole(role)) << "Unknown role '" << role << "'" << " of framework " << *this; @@ -391,7 +391,7 @@ bool Framework::isTrackedUnderRole(const std::string& role) const master->roles.at(role)->frameworks.contains(id()); } -void Framework::trackUnderRole(const std::string& role) +void Framework::trackUnderRole(const string& role) { CHECK(master->isWhitelistedRole(role)) << "Unknown role '" << role << "'" << " of framework " << *this; @@ -406,7 +406,7 @@ void Framework::trackUnderRole(const std::string& role) master->roles.at(role)->addFramework(this); } -void Framework::untrackUnderRole(const std::string& role) +void Framework::untrackUnderRole(const string& role) { CHECK(master->isWhitelistedRole(role)) << "Unknown role '" << role << "'" << " of framework " << *this; http://git-wip-us.apache.org/repos/asf/mesos/blob/a5b3c49a/src/slave/containerizer/composing.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/composing.cpp b/src/slave/containerizer/composing.cpp index b5b66b3..0b6c76b 100644 --- a/src/slave/containerizer/composing.cpp +++ b/src/slave/containerizer/composing.cpp @@ -498,7 +498,7 @@ Future<bool> ComposingContainerizerProcess::launch( const ContainerID& containerId, const CommandInfo& commandInfo, const Option<ContainerInfo>& containerInfo, - const Option<std::string>& user, + const Option<string>& user, const SlaveID& slaveId, const Option<ContainerClass>& containerClass) { http://git-wip-us.apache.org/repos/asf/mesos/blob/a5b3c49a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp index 39da15a..fc763bd 100644 --- a/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp +++ b/src/slave/containerizer/mesos/isolators/cgroups/subsystems/cpu.cpp @@ -67,7 +67,7 @@ CpuSubsystem::CpuSubsystem( Future<Nothing> CpuSubsystem::update( const ContainerID& containerId, - const std::string& cgroup, + const string& cgroup, const Resources& resources) { if (resources.cpus().isNone()) { @@ -130,7 +130,7 @@ Future<Nothing> CpuSubsystem::update( Future<ResourceStatistics> CpuSubsystem::usage( const ContainerID& containerId, - const std::string& cgroup) + const string& cgroup) { ResourceStatistics result; http://git-wip-us.apache.org/repos/asf/mesos/blob/a5b3c49a/src/slave/containerizer/mesos/linux_launcher.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/linux_launcher.cpp b/src/slave/containerizer/mesos/linux_launcher.cpp index 80c9ab2..1cea04e 100644 --- a/src/slave/containerizer/mesos/linux_launcher.cpp +++ b/src/slave/containerizer/mesos/linux_launcher.cpp @@ -68,7 +68,7 @@ public: const Option<string>& systemdHierarchy); virtual process::Future<hashset<ContainerID>> recover( - const std::list<mesos::slave::ContainerState>& states); + const list<mesos::slave::ContainerState>& states); virtual Try<pid_t> fork( const ContainerID& containerId, @@ -78,7 +78,7 @@ public: const process::Subprocess::IO& out, const process::Subprocess::IO& err, const flags::FlagsBase* flags, - const Option<std::map<string, string>>& environment, + const Option<map<string, string>>& environment, const Option<int>& enterNamespaces, const Option<int>& cloneNamespaces); @@ -196,7 +196,7 @@ LinuxLauncher::~LinuxLauncher() Future<hashset<ContainerID>> LinuxLauncher::recover( - const std::list<mesos::slave::ContainerState>& states) + const list<mesos::slave::ContainerState>& states) { return dispatch(process.get(), &LinuxLauncherProcess::recover, states); } http://git-wip-us.apache.org/repos/asf/mesos/blob/a5b3c49a/src/tests/default_executor_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/default_executor_tests.cpp b/src/tests/default_executor_tests.cpp index 452bab1..370733d 100644 --- a/src/tests/default_executor_tests.cpp +++ b/src/tests/default_executor_tests.cpp @@ -1389,7 +1389,7 @@ struct LauncherAndIsolationParam class PersistentVolumeDefaultExecutor : public MesosTest, - public ::testing::WithParamInterface<LauncherAndIsolationParam> + public WithParamInterface<LauncherAndIsolationParam> { public: PersistentVolumeDefaultExecutor() : param(GetParam()) {}
