Repository: mesos
Updated Branches:
  refs/heads/master e2e99de29 -> e48e9288b


Removed stout `Set`.

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


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

Branch: refs/heads/master
Commit: e48e9288ba654c5b85be62f577320580885cc0e9
Parents: 3e0ed79
Author: Benjamin Bannier <benjamin.bann...@mesosphere.io>
Authored: Wed Sep 21 14:08:32 2016 +0200
Committer: Michael Park <mp...@apache.org>
Committed: Wed Sep 21 17:38:53 2016 +0200

----------------------------------------------------------------------
 3rdparty/stout/Makefile.am                 |  1 -
 3rdparty/stout/include/stout/set.hpp       | 35 ---------------------
 3rdparty/stout/include/stout/stringify.hpp | 17 ----------
 3rdparty/stout/tests/CMakeLists.txt        |  1 -
 3rdparty/stout/tests/set_tests.cpp         | 42 -------------------------
 5 files changed, 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/e48e9288/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am
index fc2d2b2..fda069d 100644
--- a/3rdparty/stout/Makefile.am
+++ b/3rdparty/stout/Makefile.am
@@ -139,7 +139,6 @@ stout_tests_SOURCES =                       \
   tests/protobuf_tests.proto           \
   tests/recordio_tests.cpp             \
   tests/result_tests.cpp               \
-  tests/set_tests.cpp                  \
   tests/some_tests.cpp                 \
   tests/strings_tests.cpp              \
   tests/subcommand_tests.cpp           \

http://git-wip-us.apache.org/repos/asf/mesos/blob/e48e9288/3rdparty/stout/include/stout/set.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/set.hpp 
b/3rdparty/stout/include/stout/set.hpp
index bd7a9b9..96238a7 100644
--- a/3rdparty/stout/include/stout/set.hpp
+++ b/3rdparty/stout/include/stout/set.hpp
@@ -15,41 +15,6 @@
 
 #include <algorithm> // For std::set_intersection.
 #include <set>
-#include <vector>
-
-template <typename T>
-class Set : public std::set<T>
-{
-public:
-  Set() {}
-
-  Set(const T& t1)
-  {
-    std::set<T>::insert(t1);
-  }
-
-  Set(const T& t1, const T& t2)
-  {
-    std::set<T>::insert(t1);
-    std::set<T>::insert(t2);
-  }
-
-  Set(const T& t1, const T& t2, const T& t3)
-  {
-    std::set<T>::insert(t1);
-    std::set<T>::insert(t2);
-    std::set<T>::insert(t3);
-  }
-
-  Set(const T& t1, const T& t2, const T& t3, const T& t4)
-  {
-    std::set<T>::insert(t1);
-    std::set<T>::insert(t2);
-    std::set<T>::insert(t3);
-    std::set<T>::insert(t4);
-  }
-};
-
 
 template <typename T>
 std::set<T> operator|(const std::set<T>& left, const std::set<T>& right)

http://git-wip-us.apache.org/repos/asf/mesos/blob/e48e9288/3rdparty/stout/include/stout/stringify.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/stringify.hpp 
b/3rdparty/stout/include/stout/stringify.hpp
index b4d3e61..e9588d8 100644
--- a/3rdparty/stout/include/stout/stringify.hpp
+++ b/3rdparty/stout/include/stout/stringify.hpp
@@ -62,23 +62,6 @@ std::string stringify(const std::set<T>& set)
 
 
 template <typename T>
-std::string stringify(const Set<T>& set)
-{
-  std::ostringstream out;
-  out << "{ ";
-  typename Set<T>::const_iterator iterator = set.begin();
-  while (iterator != set.end()) {
-    out << stringify(*iterator);
-    if (++iterator != set.end()) {
-      out << ", ";
-    }
-  }
-  out << " }";
-  return out.str();
-}
-
-
-template <typename T>
 std::string stringify(const std::list<T>& list)
 {
   std::ostringstream out;

http://git-wip-us.apache.org/repos/asf/mesos/blob/e48e9288/3rdparty/stout/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/CMakeLists.txt 
b/3rdparty/stout/tests/CMakeLists.txt
index f85dc99..49971c7 100644
--- a/3rdparty/stout/tests/CMakeLists.txt
+++ b/3rdparty/stout/tests/CMakeLists.txt
@@ -48,7 +48,6 @@ set(STOUT_TESTS_SRC
   protobuf_tests.pb.h
   protobuf_tests.proto
   result_tests.cpp
-  set_tests.cpp
   some_tests.cpp
   strings_tests.cpp
   uuid_tests.cpp

http://git-wip-us.apache.org/repos/asf/mesos/blob/e48e9288/3rdparty/stout/tests/set_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/set_tests.cpp 
b/3rdparty/stout/tests/set_tests.cpp
deleted file mode 100644
index a271e99..0000000
--- a/3rdparty/stout/tests/set_tests.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License
-
-#include <set>
-
-#include <gtest/gtest.h>
-
-#include <stout/set.hpp>
-
-TEST(SetTest, Set)
-{
-  EXPECT_EQ(Set<int>(1, 2), Set<int>(1) | Set<int>(2));
-  EXPECT_EQ(Set<int>(1, 2), Set<int>(1, 2) | Set<int>(1));
-  EXPECT_EQ(Set<int>(1, 2), Set<int>(1) + 2);
-  EXPECT_EQ(Set<int>(1, 2), Set<int>(1, 2) + 2);
-  EXPECT_EQ(Set<int>(1, 2), Set<int>(1, 2, 3) & Set<int>(1, 2));
-  EXPECT_EQ(Set<int>(1, 2), Set<int>(1, 2) & Set<int>(1, 2));
-
-  Set<int> left;
-  left.insert(2);
-  left.insert(4);
-
-  Set<int> right;
-  right.insert(1);
-  right.insert(3);
-
-  EXPECT_EQ(Set<int>(1, 2, 3, 4), left | right);
-  EXPECT_EQ(Set<int>(), left & right);
-
-  std::set<int> s = left;
-
-  EXPECT_EQ(Set<int>(2, 4, 6), s + 6);
-}

Reply via email to