You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/06/25 02:28:22 UTC
[6/9] mesos git commit: Refactored os::environment to return a
std::map.
Refactored os::environment to return a std::map.
Review: https://reviews.apache.org/r/35565
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4d37ed69
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4d37ed69
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4d37ed69
Branch: refs/heads/master
Commit: 4d37ed69ba17d55b5954831b06d5ed6561e91723
Parents: f4811eb
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sun Jun 14 23:24:40 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Wed Jun 24 17:27:24 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp | 6 +++---
3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4d37ed69/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 18832d8..c283b76 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
@@ -54,6 +54,7 @@
#include <sys/wait.h>
#include <list>
+#include <map>
#include <set>
#include <string>
@@ -61,7 +62,6 @@
#include <stout/duration.hpp>
#include <stout/error.hpp>
#include <stout/foreach.hpp>
-#include <stout/hashmap.hpp>
#include <stout/none.hpp>
#include <stout/nothing.hpp>
#include <stout/option.hpp>
@@ -138,11 +138,11 @@ inline char*** environp()
}
-inline hashmap<std::string, std::string> environment()
+inline std::map<std::string, std::string> environment()
{
char** environ = os::environ();
- hashmap<std::string, std::string> result;
+ std::map<std::string, std::string> result;
for (size_t index = 0; environ[index] != NULL; index++) {
std::string entry(environ[index]);
http://git-wip-us.apache.org/repos/asf/mesos/blob/4d37ed69/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 ea797ed..7327ad2 100644
--- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
+++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp
@@ -10,6 +10,7 @@
#include <cstdlib> // For rand.
#include <list>
+#include <map>
#include <set>
#include <sstream>
#include <string>
@@ -18,7 +19,6 @@
#include <stout/foreach.hpp>
#include <stout/fs.hpp>
#include <stout/gtest.hpp>
-#include <stout/hashmap.hpp>
#include <stout/hashset.hpp>
#include <stout/numify.hpp>
#include <stout/os.hpp>