Fix capture by reference of temporaries in Stout. Review: https://reviews.apache.org/r/33275
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ae506bce Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ae506bce Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ae506bce Branch: refs/heads/master Commit: ae506bcec76440c26f1c876efa77320ec48e3664 Parents: ef4c4db Author: Joris Van Remoortere <[email protected]> Authored: Tue Jun 2 07:53:56 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Tue Jun 2 07:53:58 2015 -0700 ---------------------------------------------------------------------- .../libprocess/3rdparty/stout/include/stout/cache.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/check.hpp | 6 +++--- .../3rdparty/stout/include/stout/flags/flags.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/format.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/json.hpp | 2 +- .../3rdparty/stout/include/stout/multihashmap.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/multimap.hpp | 2 +- 3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp | 11 +++++------ .../libprocess/3rdparty/stout/include/stout/os/linux.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/os/osx.hpp | 6 +++--- .../3rdparty/stout/include/stout/os/pstree.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/os/shell.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/strings.hpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp | 10 +++++----- 14 files changed, 27 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp index 37e007e..9714d9a 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp @@ -125,7 +125,7 @@ private: // Evict the least-recently used element from the cache. void evict() { - const typename map::iterator& i = values.find(keys.front()); + const typename map::iterator i = values.find(keys.front()); CHECK(i != values.end()); values.erase(i); keys.pop_front(); http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp index 4380c24..3972383 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/check.hpp @@ -28,10 +28,10 @@ #include <stout/try.hpp> // Provides a CHECK_SOME macro, akin to CHECK. -// This appends the error if possible to the end of the log message, so there's -// no need to append the error message explicitly. +// This appends the error if possible to the end of the log message, +// so there's no need to append the error message explicitly. #define CHECK_SOME(expression) \ - for (const Option<std::string>& _error = _check(expression); \ + for (const Option<std::string> _error = _check(expression); \ _error.isSome();) \ _CheckFatal(__FILE__, __LINE__, "CHECK_SOME", \ #expression, _error.get()).stream() http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp index 61a405f..ee855da 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp @@ -668,7 +668,7 @@ inline std::ostream& operator << (std::ostream& stream, const FlagsBase& flags) std::vector<std::string> _flags; foreachvalue (const flags::Flag& flag, flags) { - const Option<std::string>& value = flag.stringify(flags); + const Option<std::string> value = flag.stringify(flags); if (value.isSome()) { _flags.push_back("--" + flag.name + "=\"" + value.get() + '"'); } http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp index abe1a1d..9bd19fd 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp @@ -77,7 +77,7 @@ inline Try<std::string> format(const std::string fmt, ...) { va_list args; va_start(args, fmt); - const Try<std::string>& result = format(fmt, args); + const Try<std::string> result = format(fmt, args); va_end(args); return result; } http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp index 8784e76..6e0a178 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/json.hpp @@ -261,7 +261,7 @@ inline const Value& Value::as<Value>() const template <typename T> Result<T> Object::find(const std::string& path) const { - const std::vector<std::string>& names = strings::split(path, ".", 2); + const std::vector<std::string> names = strings::split(path, ".", 2); if (names.empty()) { return None(); http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp index ecda6a9..a8573ed 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/multihashmap.hpp @@ -115,7 +115,7 @@ bool multihashmap<K, V>::contains(const K& key) const template <typename K, typename V> bool multihashmap<K, V>::contains(const K& key, const V& value) const { - const std::list<V>& values = get(key); + const std::list<V> values = get(key); return std::find(values.begin(), values.end(), value) != values.end(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp index 9714ba0..fb3e7a1 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/multimap.hpp @@ -113,7 +113,7 @@ bool Multimap<K, V>::contains(const K& key) const template <typename K, typename V> bool Multimap<K, V>::contains(const K& key, const V& value) const { - const std::list<V>& values = get(key); + const std::list<V> values = get(key); return std::find(values.begin(), values.end(), value) != values.end(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp index d2ca4be..8ee02ef 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp @@ -984,8 +984,7 @@ inline Try<Memory> memory() return memory; #elif defined __APPLE__ - const Try<int64_t>& totalMemory = - os::sysctl(CTL_HW, HW_MEMSIZE).integer(); + const Try<int64_t> totalMemory = os::sysctl(CTL_HW, HW_MEMSIZE).integer(); if (totalMemory.isError()) { return Error(totalMemory.error()); @@ -1110,7 +1109,7 @@ inline Try<Version> release() inline Try<std::list<Process> > processes() { - const Try<std::set<pid_t> >& pids = os::pids(); + const Try<std::set<pid_t>> pids = os::pids(); if (pids.isError()) { return Error(pids.error()); @@ -1118,7 +1117,7 @@ inline Try<std::list<Process> > processes() std::list<Process> result; foreach (pid_t pid, pids.get()) { - const Result<Process>& process = os::process(pid); + const Result<Process> process = os::process(pid); // Ignore any processes that disappear. if (process.isSome()) { @@ -1173,7 +1172,7 @@ inline std::set<pid_t> children( inline Try<std::set<pid_t> > children(pid_t pid, bool recursive = true) { - const Try<std::list<Process> >& processes = os::processes(); + const Try<std::list<Process>> processes = os::processes(); if (processes.isError()) { return Error(processes.error()); @@ -1196,7 +1195,7 @@ inline Try<std::set<pid_t> > pids(Option<pid_t> group, Option<pid_t> session) return Error("Invalid session"); } - const Try<std::list<Process> >& processes = os::processes(); + const Try<std::list<Process>> processes = os::processes(); if (processes.isError()) { return Error(processes.error()); http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp index 7a5573b..0850ae9 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp @@ -51,7 +51,7 @@ inline Result<Process> process(pid_t pid) return Error("Failed to get sysconf(_SC_CLK_TCK)"); } - const Result<proc::ProcessStatus>& status = proc::status(pid); + const Result<proc::ProcessStatus> status = proc::status(pid); if (status.isError()) { return Error(status.error()); http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp index 7d17249..c8d30d8 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp @@ -38,7 +38,7 @@ namespace os { inline Result<Process> process(pid_t pid) { - const Try<std::vector<kinfo_proc> >& processes = + const Try<std::vector<kinfo_proc>> processes = os::sysctl(CTL_KERN, KERN_PROC, KERN_PROC_PID, pid).table(1); if (processes.isError()) { @@ -166,13 +166,13 @@ inline Result<Process> process(pid_t pid) inline Try<std::set<pid_t> > pids() { - const Try<int>& maxproc = os::sysctl(CTL_KERN, KERN_MAXPROC).integer(); + const Try<int> maxproc = os::sysctl(CTL_KERN, KERN_MAXPROC).integer(); if (maxproc.isError()) { return Error(maxproc.error()); } - const Try<std::vector<kinfo_proc> >& processes = + const Try<std::vector<kinfo_proc>> processes = os::sysctl(CTL_KERN, KERN_PROC, KERN_PROC_ALL).table(maxproc.get()); if (processes.isError()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp index 9426895..ba8e579 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/pstree.hpp @@ -70,7 +70,7 @@ inline Try<ProcessTree> pstree(Option<pid_t> pid = None()) pid = getpid(); } - const Try<std::list<Process> >& processes = os::processes(); + const Try<std::list<Process>> processes = os::processes(); if (processes.isError()) { return Error(processes.error()); http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp index 6728ad8..f6d3b76 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/shell.hpp @@ -34,7 +34,7 @@ inline Try<int> shell(std::ostream* os, const std::string fmt, ...) va_list args; va_start(args, fmt); - const Try<std::string>& command = strings::internal::format(fmt, args); + const Try<std::string> command = strings::internal::format(fmt, args); va_end(args); http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp index 46b79bc..702ed0b 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp @@ -177,9 +177,9 @@ inline std::map<std::string, std::vector<std::string> > pairs( { std::map<std::string, std::vector<std::string> > result; - const std::vector<std::string>& tokens = tokenize(s, delims1); + const std::vector<std::string> tokens = tokenize(s, delims1); foreach (const std::string& token, tokens) { - const std::vector<std::string>& pairs = tokenize(token, delims2); + const std::vector<std::string> pairs = tokenize(token, delims2); if (pairs.size() == 2) { result[pairs[0]].push_back(pairs[1]); } http://git-wip-us.apache.org/repos/asf/mesos/blob/ae506bce/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp index 7ea9475..62987e0 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp @@ -294,7 +294,7 @@ TEST_F(OsTest, bootId) TEST_F(OsTest, uname) { - const Try<os::UTSInfo>& info = os::uname(); + const Try<os::UTSInfo> info = os::uname(); ASSERT_SOME(info); #ifdef __linux__ @@ -308,7 +308,7 @@ TEST_F(OsTest, uname) TEST_F(OsTest, sysname) { - const Try<string>& name = os::sysname(); + const Try<string> name = os::sysname(); ASSERT_SOME(name); #ifdef __linux__ @@ -322,7 +322,7 @@ TEST_F(OsTest, sysname) TEST_F(OsTest, release) { - const Try<Version>& info = os::release(); + const Try<Version> info = os::release(); ASSERT_SOME(info); } @@ -466,7 +466,7 @@ TEST_F(OsTest, children) TEST_F(OsTest, process) { - const Result<Process>& process = os::process(getpid()); + const Result<Process> process = os::process(getpid()); ASSERT_SOME(process); EXPECT_EQ(getpid(), process.get().pid); @@ -490,7 +490,7 @@ TEST_F(OsTest, process) TEST_F(OsTest, processes) { - const Try<list<Process> >& processes = os::processes(); + const Try<list<Process>> processes = os::processes(); ASSERT_SOME(processes); ASSERT_GT(processes.get().size(), 2);
