[libcxx-commits] [libcxx] [libc++] constexpr priority_queue (PR #140634)

[Louis Dionne via libcxx-commits]

================
@@ -19,40 +19,49 @@
 #include "test_allocator.h"
 
 template <class C>
-C make(int n) {
+TEST_CONSTEXPR_CXX26 C make(int n) {
   C c;
   for (int i = 0; i < n; ++i)
     c.push_back(i);
   return c;
 }
 
 template <class T>
-struct test : public std::priority_queue<T, std::vector<T, test_allocator<T> > > {
+struct Test : public std::priority_queue<T, std::vector<T, test_allocator<T> > > {
   typedef std::priority_queue<T, std::vector<T, test_allocator<T> > > base;
   typedef typename base::container_type container_type;
   typedef typename base::value_compare value_compare;
 
-  explicit test(const test_allocator<int>& a) : base(a) {}
-  test(const value_compare& compare, const test_allocator<int>& a) : base(compare, a) {}
-  test(const value_compare& compare, const container_type& container, const test_allocator<int>& a)
+  TEST_CONSTEXPR_CXX26 explicit Test(const test_allocator<int>& a) : base(a) {}
+  TEST_CONSTEXPR_CXX26 Test(const value_compare& compare, const test_allocator<int>& a) : base(compare, a) {}
+  TEST_CONSTEXPR_CXX26 Test(const value_compare& compare, const container_type& container, const test_allocator<int>& a)
       : base(compare, container, a) {}
 #if TEST_STD_VER >= 11 // testing rvalue constructor
-  test(const value_compare& compare, container_type&& container, const test_allocator<int>& a)
+  TEST_CONSTEXPR_CXX26 Test(const value_compare& compare, container_type&& container, const test_allocator<int>& a)
       : base(compare, std::move(container), a) {}
-  test(test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
+  TEST_CONSTEXPR_CXX26 Test(Test&& q, const test_allocator<int>& a) : base(std::move(q), a) {}
 #endif
-  test_allocator<int> get_allocator() { return c.get_allocator(); }
+  TEST_CONSTEXPR_CXX26 test_allocator<int> get_allocator() { return c.get_allocator(); }
 
   using base::c;
 };
 
-int main(int, char**) {
+TEST_CONSTEXPR_CXX26 bool test() {
   typedef std::vector<int, test_allocator<int> > C;
   C v = make<C>(5);
-  test<int> q(std::less<int>(), v, test_allocator<int>(3));
+  Test<int> q(std::less<int>(), v, test_allocator<int>(3));
   assert(q.c.get_allocator() == test_allocator<int>(3));
   assert(q.size() == 5);
   assert(q.top() == 4);
 
-  return 0;
+  return true;
 }
+
+int main(int, char**) {
+  assert(test());
+#if TEST_STD_VER >= 26
+  static_assert(test());
+#endif
+
+  return 0;
+}
----------------
ldionne wrote:

Nit: missing newline.

https://github.com/llvm/llvm-project/pull/140634