Update deduction guides

morzhovets · Nov 10, 2024 · 0ac2530 · 0ac2530
1 parent 2f7e2f1
commit 0ac2530
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/test/sources/libcxx/multiset/multiset.cons/deduct.pass.cpp b/test/sources/libcxx/multiset/multiset.cons/deduct.pass.cpp
@@ -103,7 +103,6 @@ int main(int, char **) {
   }
 #endif
 
-#if !defined(TEST_GCC)
   {
     momo::stdish::multiset s{ 1, 2, 1, INT_MAX, 3 };
 
@@ -112,7 +111,6 @@ int main(int, char **) {
     assert(std::equal(s.begin(), s.end(), std::begin(expected_s),
                       std::end(expected_s)));
   }
-#endif
 
   {
     momo::stdish::multiset s({ 1, 2, 1, INT_MAX, 3 }, std::greater<int>());
@@ -159,7 +157,6 @@ int main(int, char **) {
     assert(s.get_allocator().get_id() == 45);
   }
 
-#if !defined(TEST_GCC)
   {
     NotAnAllocator a;
     momo::stdish::multiset s{ a }; // multiset(initializer_list<NotAnAllocator>)
@@ -180,7 +177,6 @@ int main(int, char **) {
     ASSERT_SAME_TYPE(decltype(s), momo::stdish::multiset<NotAnAllocator>);
     assert(s.size() == 2);
   }
-#endif
 
   {
     int source[3] = { 3, 4, 5 };
@@ -189,14 +185,12 @@ int main(int, char **) {
     assert(s.size() == 3);
   }
 
-#if !defined(TEST_GCC)
   {
     int source[3] = { 3, 4, 5 };
     momo::stdish::multiset s{ source, source + 3 }; // multiset(initializer_list<int*>)
     ASSERT_SAME_TYPE(decltype(s), momo::stdish::multiset<int *>);
     assert(s.size() == 2);
   }
-#endif
 
 #if TEST_STD_VER >= 23
     {
@@ -227,10 +221,8 @@ int main(int, char **) {
     }
 #endif
 
-#if MOMO_VERSION_MAJOR > 3
   //AssociativeContainerDeductionGuidesSfinaeAway<std::multiset, std::multiset<int>>();
   AssociativeContainerDeductionGuidesSfinaeAway<momo::stdish::multiset, momo::stdish::multiset<int>>();
-#endif
 
   return 0;
 }
diff --git a/test/sources/libcxx11/multiset/multiset.cons/deduct.pass.cpp b/test/sources/libcxx11/multiset/multiset.cons/deduct.pass.cpp
@@ -104,7 +104,6 @@ void main() {
   }
 #endif
 
-#if !defined(TEST_GCC)
   {
     momo::stdish::multiset s{ 1, 2, 1, INT_MAX, 3 };
 
@@ -113,7 +112,6 @@ void main() {
     assert(std::equal(s.begin(), s.end(), std::begin(expected_s),
                       std::end(expected_s)));
   }
-#endif
 
   {
     momo::stdish::multiset s({ 1, 2, 1, INT_MAX, 3 }, std::greater<int>());
@@ -160,7 +158,6 @@ void main() {
     assert(s.get_allocator().get_id() == 45);
   }
 
-#if !defined(TEST_GCC)
   {
     NotAnAllocator a;
     momo::stdish::multiset s{ a }; // multiset(initializer_list<NotAnAllocator>)
@@ -181,7 +178,6 @@ void main() {
     ASSERT_SAME_TYPE(decltype(s), momo::stdish::multiset<NotAnAllocator>);
     assert(s.size() == 2);
   }
-#endif
 
   {
     int source[3] = { 3, 4, 5 };
@@ -190,12 +186,10 @@ void main() {
     assert(s.size() == 3);
   }
 
-#if !defined(TEST_GCC)
   {
     int source[3] = { 3, 4, 5 };
     momo::stdish::multiset s{ source, source + 3 }; // multiset(initializer_list<int*>)
     ASSERT_SAME_TYPE(decltype(s), momo::stdish::multiset<int *>);
     assert(s.size() == 2);
   }
-#endif
 }