restore libcxx/test/std/containers/associative/iterator_types.pass.cpp

vinay-deshmukh · vinay-deshmukh · commit 5764d913c290 · 2025-11-10T07:19:09.000-05:00
diff --git a/libcxx/test/std/containers/associative/iterator_types.pass.cpp b/libcxx/test/std/containers/associative/iterator_types.pass.cpp
@@ -46,7 +46,7 @@ void testSet() {
   }
 }
 
-TEST_CONSTEXPR_CXX26 bool test() {
+int main(int, char**) {
   {
     typedef std::map<int, int> Map;
     typedef std::pair<const int, int> ValueTp;
@@ -124,12 +124,5 @@ TEST_CONSTEXPR_CXX26 bool test() {
   }
 #endif
 
-  return true;
-}
-int main(int, char**) {
-  test();
-#if TEST_STD_VER >= 26
-  static_assert(test());
-#endif
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ void testSet() {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-TEST_CONSTEXPR_CXX26 bool test() {`
	`49`	`+int main(int, char**) {`
`50`	`50`	`{`
`51`	`51`	`typedef std::map<int, int> Map;`
`52`	`52`	`typedef std::pair<const int, int> ValueTp;`
`@@ -124,12 +124,5 @@ TEST_CONSTEXPR_CXX26 bool test() {`
`124`	`124`	`}`
`125`	`125`	`#endif`
`126`	`126`
`127`		`- return true;`
`128`		`-}`
`129`		`-int main(int, char**) {`
`130`		`- test();`
`131`		`-#if TEST_STD_VER >= 26`
`132`		`- static_assert(test());`
`133`		`-#endif`
`134`	`127`	`return 0;`
`135`	`128`	`}`