You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/04/24 17:53:27 UTC
[2/2] mesos git commit: Reverted change to namespacing of
`Environment` in stout.
Reverted change to namespacing of `Environment` in stout.
This unbreaks the libprocess and Mesos test builds. Original change made
in commit bca95cabbfb07cc6293bf499f566244ea3bb0a94.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/659fd1dd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/659fd1dd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/659fd1dd
Branch: refs/heads/master
Commit: 659fd1dd7f44ab08311a25c0b4a6cf66a616eb28
Parents: dc2effe
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Apr 24 13:52:05 2017 -0400
Committer: Neil Conway <ne...@gmail.com>
Committed: Mon Apr 24 13:52:05 2017 -0400
----------------------------------------------------------------------
3rdparty/stout/include/stout/tests/environment.hpp | 8 ++++++++
3rdparty/stout/tests/main.cpp | 3 +++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/659fd1dd/3rdparty/stout/include/stout/tests/environment.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/tests/environment.hpp b/3rdparty/stout/include/stout/tests/environment.hpp
index 5909aa7..0b30c18 100644
--- a/3rdparty/stout/include/stout/tests/environment.hpp
+++ b/3rdparty/stout/include/stout/tests/environment.hpp
@@ -25,6 +25,10 @@
#include <stout/strings.hpp>
+namespace stout {
+namespace internal {
+namespace tests {
+
class TestFilter
{
public:
@@ -133,4 +137,8 @@ public:
}
};
+} // namespace tests {
+} // namespace internal {
+} // namespace stout {
+
#endif // __STOUT_TESTS_ENVIRONMENT_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/659fd1dd/3rdparty/stout/tests/main.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/main.cpp b/3rdparty/stout/tests/main.cpp
index 09868e5..144399d 100644
--- a/3rdparty/stout/tests/main.cpp
+++ b/3rdparty/stout/tests/main.cpp
@@ -30,6 +30,9 @@
#include <stout/tests/environment.hpp>
+using stout::internal::tests::Environment;
+using stout::internal::tests::TestFilter;
+
using std::make_shared;
using std::shared_ptr;
using std::string;