You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/08/10 17:58:14 UTC

[3/4] mesos git commit: Removed unneeded extra space in stout code base.

Removed unneeded extra space in stout code base.

This patch is part of MESOS-5830, specially working on cleaning up
unneeded space in project stout.

Review: https://reviews.apache.org/r/50899/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a57e5a43
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a57e5a43
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a57e5a43

Branch: refs/heads/master
Commit: a57e5a43af3fda1cdc4c37995a3cf0f94daeab62
Parents: bea8c3c
Author: Gaojin CAO <ca...@cmss.chinamobile.com>
Authored: Wed Aug 10 18:41:01 2016 +0100
Committer: Michael Park <mp...@apache.org>
Committed: Wed Aug 10 18:49:21 2016 +0100

----------------------------------------------------------------------
 3rdparty/stout/include/stout/flags.hpp         |  2 +-
 3rdparty/stout/include/stout/interval.hpp      | 10 +++++-----
 3rdparty/stout/include/stout/json.hpp          |  2 +-
 3rdparty/stout/include/stout/linkedhashmap.hpp |  2 +-
 3rdparty/stout/include/stout/os/osx.hpp        |  2 +-
 3rdparty/stout/include/stout/os/sunos.hpp      |  4 ++--
 3rdparty/stout/include/stout/os/sysctl.hpp     |  4 ++--
 3rdparty/stout/include/stout/proc.hpp          | 10 +++++-----
 3rdparty/stout/include/stout/protobuf.hpp      |  2 +-
 3rdparty/stout/include/stout/strings.hpp       |  4 ++--
 3rdparty/stout/tests/flags_tests.cpp           | 22 ++++++++++-----------
 3rdparty/stout/tests/ip_tests.cpp              |  2 +-
 3rdparty/stout/tests/mac_tests.cpp             |  2 +-
 3rdparty/stout/tests/multimap_tests.cpp        |  2 +-
 3rdparty/stout/tests/option_tests.cpp          |  4 ++--
 3rdparty/stout/tests/os/process_tests.cpp      |  2 +-
 3rdparty/stout/tests/os_tests.cpp              |  6 +++---
 3rdparty/stout/tests/proc_tests.cpp            |  8 ++++----
 3rdparty/stout/tests/strings_tests.cpp         |  2 +-
 19 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/flags.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/flags.hpp b/3rdparty/stout/include/stout/flags.hpp
index 169f959..bc4684d 100644
--- a/3rdparty/stout/include/stout/flags.hpp
+++ b/3rdparty/stout/include/stout/flags.hpp
@@ -39,7 +39,7 @@
 //
 // ...
 //
-// map<string, Option<string> > values;
+// map<string, Option<string>> values;
 // values["no-debug"] = None();            // --no-debug
 // values["debug"] = None();               // --debug
 // values["debug"] = Some("true");         // --debug=true

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/interval.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/interval.hpp b/3rdparty/stout/include/stout/interval.hpp
index e6deeac..d0bbcb3 100644
--- a/3rdparty/stout/include/stout/interval.hpp
+++ b/3rdparty/stout/include/stout/interval.hpp
@@ -170,7 +170,7 @@ Interval<T> Bound<T>::operator , (const Bound<T>& right) const
 // Modeled after boost interval_set. Provides a compact representation
 // of a set by merging adjacent elements into intervals.
 template <typename T>
-class IntervalSet : public boost::icl::interval_set<T, std::less, Interval<T> >
+class IntervalSet : public boost::icl::interval_set<T, std::less, Interval<T>>
 {
 public:
   IntervalSet() {}
@@ -306,7 +306,7 @@ private:
       const IntervalSet<X>& set);
 
   // We use typedef here to make the code less verbose.
-  typedef boost::icl::interval_set<T, std::less, Interval<T> > Base;
+  typedef boost::icl::interval_set<T, std::less, Interval<T>> Base;
 };
 
 
@@ -355,7 +355,7 @@ namespace boost {
 namespace icl {
 
 template <typename T>
-struct interval_traits<Interval<T> >
+struct interval_traits<Interval<T>>
 {
   typedef interval_traits type;
   typedef T domain_type;
@@ -379,8 +379,8 @@ struct interval_traits<Interval<T> >
 
 
 template <typename T>
-struct interval_bound_type<Interval<T> >
-  : public interval_bound_type<right_open_interval<T, std::less> >
+struct interval_bound_type<Interval<T>>
+  : public interval_bound_type<right_open_interval<T, std::less>>
 {
   typedef interval_bound_type type;
 };

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/json.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/json.hpp b/3rdparty/stout/include/stout/json.hpp
index 51b1ada..9734561 100644
--- a/3rdparty/stout/include/stout/json.hpp
+++ b/3rdparty/stout/include/stout/json.hpp
@@ -227,7 +227,7 @@ typedef boost::variant<boost::recursive_wrapper<Null>,
                        boost::recursive_wrapper<Number>,
                        boost::recursive_wrapper<Object>,
                        boost::recursive_wrapper<Array>,
-                       boost::recursive_wrapper<Boolean> > Variant;
+                       boost::recursive_wrapper<Boolean>> Variant;
 
 } // namespace internal {
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/linkedhashmap.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/linkedhashmap.hpp b/3rdparty/stout/include/stout/linkedhashmap.hpp
index 6e06260..38acdc8 100644
--- a/3rdparty/stout/include/stout/linkedhashmap.hpp
+++ b/3rdparty/stout/include/stout/linkedhashmap.hpp
@@ -29,7 +29,7 @@ class LinkedHashMap
 {
 public:
   typedef std::list<Key> list;
-  typedef hashmap<Key, std::pair<Value, typename list::iterator> > map;
+  typedef hashmap<Key, std::pair<Value, typename list::iterator>> map;
 
   Value& operator[] (const Key& key)
   {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/os/osx.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/osx.hpp b/3rdparty/stout/include/stout/os/osx.hpp
index ca77bb0..54d3412 100644
--- a/3rdparty/stout/include/stout/os/osx.hpp
+++ b/3rdparty/stout/include/stout/os/osx.hpp
@@ -166,7 +166,7 @@ inline Result<Process> process(pid_t pid)
 }
 
 
-inline Try<std::set<pid_t> > pids()
+inline Try<std::set<pid_t>> pids()
 {
   const Try<int> maxproc = os::sysctl(CTL_KERN, KERN_MAXPROC).integer();
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/os/sunos.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/sunos.hpp b/3rdparty/stout/include/stout/os/sunos.hpp
index ec8e1f7..e0398d2 100644
--- a/3rdparty/stout/include/stout/os/sunos.hpp
+++ b/3rdparty/stout/include/stout/os/sunos.hpp
@@ -86,11 +86,11 @@ inline Result<Process> process(pid_t pid)
 }
 
 // Reads from /proc and returns a list of all running processes.
-inline Try<std::set<pid_t> > pids()
+inline Try<std::set<pid_t>> pids()
 {
   std::set<pid_t> pids;
 
-  Try<std::list<std::string> > entries = os::ls("/proc");
+  Try<std::list<std::string>> entries = os::ls("/proc");
   if (entries.isError()) {
     return Error("Failed to list files in /proc: " + entries.error());
   }

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/os/sysctl.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/os/sysctl.hpp b/3rdparty/stout/include/stout/os/sysctl.hpp
index 6db7bf6..8dc6661 100644
--- a/3rdparty/stout/include/stout/os/sysctl.hpp
+++ b/3rdparty/stout/include/stout/os/sysctl.hpp
@@ -51,7 +51,7 @@ namespace os {
 // would like the length to be looked up dynamically you can just pass
 // None. Here's an example using 'table' that builds on above:
 //
-//   Try<vector<kinfo_proc> > processes =
+//   Try<vector<kinfo_proc>> processes =
 //     os::sysctl(CTL_KERN, KERN_PROC, KERN_PROC_ALL).table(maxprox.get());
 //
 // TODO(benh): Provide an 'integer(i)', 'string(s)', and 'table(t)' to
@@ -87,7 +87,7 @@ public:
   // 'Table' to a std::vector<T>. For example, to get the first 10
   // processes in the process table you can do:
   //
-  //     Try<std::vector<kinfo_proc> > processes =
+  //     Try<std::vector<kinfo_proc>> processes =
   //       os::sysctl(CTL_KERN, KERN_PROC, KERN_PROC_ALL).table(10);
   //
 private: struct Table; // Forward declaration.

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/proc.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/proc.hpp b/3rdparty/stout/include/stout/proc.hpp
index b543432..dd0d623 100644
--- a/3rdparty/stout/include/stout/proc.hpp
+++ b/3rdparty/stout/include/stout/proc.hpp
@@ -291,11 +291,11 @@ inline Result<std::string> cmdline(const Option<pid_t>& pid = None())
 
 
 // Reads from /proc and returns a list of all running processes.
-inline Try<std::set<pid_t> > pids()
+inline Try<std::set<pid_t>> pids()
 {
   std::set<pid_t> pids;
 
-  Try<std::list<std::string> > entries = os::ls("/proc");
+  Try<std::list<std::string>> entries = os::ls("/proc");
   if (entries.isError()) {
     return Error("Failed to list files in /proc: " + entries.error());
   }
@@ -316,13 +316,13 @@ inline Try<std::set<pid_t> > pids()
 
 
 // Reads from /proc/<pid>/task/* and returns a list of threads ids for pid.
-inline Try<std::set<pid_t> > threads(pid_t pid)
+inline Try<std::set<pid_t>> threads(pid_t pid)
 {
   const std::string path = path::join("/proc", stringify(pid), "task");
 
   std::set<pid_t> threads;
 
-  Try<std::list<std::string> > entries = os::ls(path);
+  Try<std::list<std::string>> entries = os::ls(path);
   if (entries.isError()) {
     return Error("Failed to list files in " + path + ": " + entries.error());
   }
@@ -433,7 +433,7 @@ inline std::ostream& operator<<(std::ostream& out, const CPU& cpu)
 
 
 // Reads from /proc/cpuinfo and returns a list of CPUs.
-inline Try<std::list<CPU> > cpus()
+inline Try<std::list<CPU>> cpus()
 {
   std::list<CPU> results;
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/protobuf.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/protobuf.hpp b/3rdparty/stout/include/stout/protobuf.hpp
index 91305e1..80cb20f 100644
--- a/3rdparty/stout/include/stout/protobuf.hpp
+++ b/3rdparty/stout/include/stout/protobuf.hpp
@@ -400,7 +400,7 @@ Try<Nothing> parse(
     const JSON::Object& object);
 
 
-struct Parser : boost::static_visitor<Try<Nothing> >
+struct Parser : boost::static_visitor<Try<Nothing>>
 {
   Parser(google::protobuf::Message* _message,
          const google::protobuf::FieldDescriptor* _field)

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/include/stout/strings.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/strings.hpp b/3rdparty/stout/include/stout/strings.hpp
index 7f7f1cf..fe469fa 100644
--- a/3rdparty/stout/include/stout/strings.hpp
+++ b/3rdparty/stout/include/stout/strings.hpp
@@ -207,12 +207,12 @@ inline std::vector<std::string> split(
 // Would return a map with the following:
 //   bar: ["2"]
 //   foo: ["1", "3"]
-inline std::map<std::string, std::vector<std::string> > pairs(
+inline std::map<std::string, std::vector<std::string>> pairs(
     const std::string& s,
     const std::string& delims1,
     const std::string& delims2)
 {
-  std::map<std::string, std::vector<std::string> > result;
+  std::map<std::string, std::vector<std::string>> result;
 
   const std::vector<std::string> tokens = tokenize(s, delims1);
   foreach (const std::string& token, tokens) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/flags_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/flags_tests.cpp b/3rdparty/stout/tests/flags_tests.cpp
index 77f3a6a..848d707 100644
--- a/3rdparty/stout/tests/flags_tests.cpp
+++ b/3rdparty/stout/tests/flags_tests.cpp
@@ -88,7 +88,7 @@ TEST(FlagsTest, Load)
 {
   TestFlags flags;
 
-  const map<string, Option<string> > values = {
+  const map<string, Option<string>> values = {
     {"name1", Some("billy joel")},
     {"name2", Some("43")},
     {"name3", Some("false")},
@@ -137,7 +137,7 @@ TEST(FlagsTest, Add)
             "name9",
             "Also set name9");
 
-  const map<string, Option<string> > values = {
+  const map<string, Option<string>> values = {
     {"name6", Some("ben folds")},
     {"no-name7", None()},
     {"name9", Some("")}
@@ -185,7 +185,7 @@ TEST(FlagsTest, Alias)
             "value8");
 
   // Load with alias names.
-  const map<string, Option<string> > values = {
+  const map<string, Option<string>> values = {
      {"alias6", Some("foo")},
      {"no-alias7", None()},
      {"alias8", Some("bar")}
@@ -206,7 +206,7 @@ TEST(FlagsTest, Flags)
 {
   TestFlags flags;
 
-  const map<string, Option<string> > values = {
+  const map<string, Option<string>> values = {
     {"name1", Some("billy joel")},
     {"name2", Some("43")},
     {"name3", Some("false")},
@@ -413,7 +413,7 @@ TEST(FlagsTest, Stringification)
             "name8",
             "Optional name8");
 
-  const map<string, Option<string> > values = {
+  const map<string, Option<string>> values = {
     {"name2", Some("43")},
     {"no-name4", None()},
     {"name5", None()}
@@ -470,7 +470,7 @@ TEST(FlagsTest, EffectiveName)
             "value7");
 
   // Only load "name6" flag explicitly.
-  const map<string, Option<string> > values = {
+  const map<string, Option<string>> values = {
     {"alias6", Some("value6")}
   };
 
@@ -497,7 +497,7 @@ TEST(FlagsTest, DeprecationWarning)
             flags::DeprecatedName("alias6"),
             "Also set name6");
 
-  const map<string, Option<string> > values = {
+  const map<string, Option<string>> values = {
     {"alias6", Some("value6")}
   };
 
@@ -853,7 +853,7 @@ TEST(FlagsTest, Duration)
             "name7",
             "Also some amount of time");
 
-  const map<string, Option<string> > values = {
+  const map<string, Option<string>> values = {
     {"name6", Some("2mins")},
     {"name7", Some("3hrs")}
   };
@@ -887,7 +887,7 @@ TEST(FlagsTest, JSON)
 
   object.values["nested"] = nested;
 
-  map<string, Option<string> > values;
+  map<string, Option<string>> values;
   values["json"] = Some(stringify(object));
 
   ASSERT_SOME(flags.load(values));
@@ -925,7 +925,7 @@ TEST_F(FlagsFileTest, JSONFile)
   ASSERT_SOME(os::write(file, stringify(object)));
 
   // Read the JSON from the file.
-  map<string, Option<string> > values;
+  map<string, Option<string>> values;
   values["json"] = Some(file);
 
   ASSERT_SOME(flags.load(values));
@@ -949,7 +949,7 @@ TEST_F(FlagsFileTest, FilePrefix)
   ASSERT_SOME(os::write(file, "testing"));
 
   // Read the JSON from the file.
-  map<string, Option<string> > values;
+  map<string, Option<string>> values;
   values["something"] = Some("file://" + file);
 
   ASSERT_SOME(flags.load(values));

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/ip_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/ip_tests.cpp b/3rdparty/stout/tests/ip_tests.cpp
index 4d1f1c9..59e69a5 100644
--- a/3rdparty/stout/tests/ip_tests.cpp
+++ b/3rdparty/stout/tests/ip_tests.cpp
@@ -33,7 +33,7 @@ using std::vector;
 
 TEST(NetTest, LinkDevice)
 {
-  Try<set<string> > links = net::links();
+  Try<set<string>> links = net::links();
   ASSERT_SOME(links);
 
   foreach (const string& link, links.get()) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/mac_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/mac_tests.cpp b/3rdparty/stout/tests/mac_tests.cpp
index 1ff60cf..ebd50a0 100644
--- a/3rdparty/stout/tests/mac_tests.cpp
+++ b/3rdparty/stout/tests/mac_tests.cpp
@@ -32,7 +32,7 @@ using std::vector;
 
 TEST(NetTest, Mac)
 {
-  Try<set<string> > links = net::links();
+  Try<set<string>> links = net::links();
   ASSERT_SOME(links);
 
   foreach (const string& link, links.get()) {

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/multimap_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/multimap_tests.cpp b/3rdparty/stout/tests/multimap_tests.cpp
index 2f606eb..488991b 100644
--- a/3rdparty/stout/tests/multimap_tests.cpp
+++ b/3rdparty/stout/tests/multimap_tests.cpp
@@ -28,7 +28,7 @@ template <typename T>
 class MultimapTest : public ::testing::Test {};
 
 typedef ::testing::Types<
-  Multimap<string, uint16_t>, multihashmap<string, uint16_t> > MultimapTypes;
+  Multimap<string, uint16_t>, multihashmap<string, uint16_t>> MultimapTypes;
 
 // Causes all TYPED_TEST(MultimapTest, ...) to be run for each of the
 // specified multimap types.

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/option_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/option_tests.cpp b/3rdparty/stout/tests/option_tests.cpp
index 36abe13..73b03b0 100644
--- a/3rdparty/stout/tests/option_tests.cpp
+++ b/3rdparty/stout/tests/option_tests.cpp
@@ -102,8 +102,8 @@ TEST(OptionTest, Comparison)
   Option<int> two = 2;
   EXPECT_NE(one, two);
 
-  Option<Option<int> > someNone = Option<Option<int> >::some(None());
-  Option<Option<int> > noneNone = Option<Option<int> >::none();
+  Option<Option<int>> someNone = Option<Option<int>>::some(None());
+  Option<Option<int>> noneNone = Option<Option<int>>::none();
   EXPECT_NE(someNone, noneNone);
   EXPECT_NE(noneNone, someNone);
 }

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/os/process_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os/process_tests.cpp b/3rdparty/stout/tests/os/process_tests.cpp
index b536e66..1e26877 100644
--- a/3rdparty/stout/tests/os/process_tests.cpp
+++ b/3rdparty/stout/tests/os/process_tests.cpp
@@ -155,7 +155,7 @@ TEST_F(ProcessTest, Processes)
 
 TEST_F(ProcessTest, Pids)
 {
-  Try<set<pid_t> > pids = os::pids();
+  Try<set<pid_t>> pids = os::pids();
   ASSERT_SOME(pids);
   EXPECT_NE(0u, pids.get().size());
   EXPECT_EQ(1u, pids.get().count(getpid()));

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/os_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/os_tests.cpp b/3rdparty/stout/tests/os_tests.cpp
index e674440..c2900b8 100644
--- a/3rdparty/stout/tests/os_tests.cpp
+++ b/3rdparty/stout/tests/os_tests.cpp
@@ -262,7 +262,7 @@ TEST_F(OsTest, Sysctl)
   ASSERT_SOME(maxproc);
 
   // Table test.
-  Try<vector<kinfo_proc> > processes =
+  Try<vector<kinfo_proc>> processes =
     os::sysctl(CTL_KERN, KERN_PROC, KERN_PROC_ALL).table(maxproc.get());
 
   ASSERT_SOME(processes);
@@ -294,7 +294,7 @@ TEST_F(OsTest, Sysctl)
 
 TEST_F(OsTest, Children)
 {
-  Try<set<pid_t> > children = os::children(getpid());
+  Try<set<pid_t>> children = os::children(getpid());
 
   ASSERT_SOME(children);
   EXPECT_EQ(0u, children.get().size());
@@ -412,7 +412,7 @@ TEST_F(OsTest, Killtree)
 
   // Kill the process tree and follow sessions and groups to make sure
   // we cross the broken link due to the grandchild.
-  Try<list<ProcessTree> > trees =
+  Try<list<ProcessTree>> trees =
     os::killtree(child, SIGKILL, true, true);
 
   ASSERT_SOME(trees);

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/proc_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/proc_tests.cpp b/3rdparty/stout/tests/proc_tests.cpp
index 17b9093..c6d1d44 100644
--- a/3rdparty/stout/tests/proc_tests.cpp
+++ b/3rdparty/stout/tests/proc_tests.cpp
@@ -40,7 +40,7 @@ using std::string;
 
 TEST(ProcTest, Pids)
 {
-  Try<set<pid_t> > pids = proc::pids();
+  Try<set<pid_t>> pids = proc::pids();
 
   ASSERT_SOME(pids);
   EXPECT_NE(0u, pids.get().size());
@@ -51,7 +51,7 @@ TEST(ProcTest, Pids)
 
 TEST(ProcTest, Cpus)
 {
-  Try<std::list<CPU> > cpus = proc::cpus();
+  Try<std::list<CPU>> cpus = proc::cpus();
 
   ASSERT_SOME(cpus);
   EXPECT_LE(1u, cpus.get().size());
@@ -81,7 +81,7 @@ TEST(ProcTest, ProcessStatus)
 TEST(ProcTest, SingleThread)
 {
   // Check we have the expected number of threads.
-  Try<set<pid_t> > threads = proc::threads(::getpid());
+  Try<set<pid_t>> threads = proc::threads(::getpid());
 
   ASSERT_SOME(threads);
   EXPECT_EQ(1u, threads.get().size());
@@ -113,7 +113,7 @@ TEST(ProcTest, MultipleThreads)
   }
 
   // Check we have the expected number of threads.
-  Try<set<pid_t> > threads = proc::threads(::getpid());
+  Try<set<pid_t>> threads = proc::threads(::getpid());
 
   ASSERT_SOME(threads);
   EXPECT_EQ(1u + numThreads, threads.get().size());

http://git-wip-us.apache.org/repos/asf/mesos/blob/a57e5a43/3rdparty/stout/tests/strings_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/strings_tests.cpp b/3rdparty/stout/tests/strings_tests.cpp
index b54a9db..7dd3301 100644
--- a/3rdparty/stout/tests/strings_tests.cpp
+++ b/3rdparty/stout/tests/strings_tests.cpp
@@ -435,7 +435,7 @@ TEST(StringsTest, SplitNWithMultipleDelims)
 
 TEST(StringsTest, Pairs)
 {
-  map<string, vector<string> > pairs = strings::pairs("one=1,two=2", ",", "=");
+  map<string, vector<string>> pairs = strings::pairs("one=1,two=2", ",", "=");
   ASSERT_EQ(2u, pairs.size());
   ASSERT_EQ(1u, pairs.count("one"));
   ASSERT_EQ(1u, pairs["one"].size());