[libcxx-commits] [libcxx] a3e35a4 - [libc++] Move scoped allocator adaptor test to .compile.pass.cpp

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2024-01-30T09:59:51-05:00
New Revision: a3e35a4ea6fa8f1d765674c57ad280d1cbeceb4b

URL: https://github.com/llvm/llvm-project/commit/a3e35a4ea6fa8f1d765674c57ad280d1cbeceb4b
DIFF: https://github.com/llvm/llvm-project/commit/a3e35a4ea6fa8f1d765674c57ad280d1cbeceb4b.diff

LOG: [libc++] Move scoped allocator adaptor test to .compile.pass.cpp

Added: 
    libcxx/test/std/utilities/allocator.adaptor/types.compile.pass.cpp

Modified: 
    

Removed: 
    libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp


################################################################################
diff  --git a/libcxx/test/std/utilities/allocator.adaptor/types.compile.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/types.compile.pass.cpp
new file mode 100644
index 000000000000..fa82b5c456ff
--- /dev/null
+++ b/libcxx/test/std/utilities/allocator.adaptor/types.compile.pass.cpp
@@ -0,0 +1,66 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03
+
+// <memory>
+
+// template <class OuterAlloc, class... InnerAllocs>
+// class scoped_allocator_adaptor
+//     : public OuterAlloc
+// {
+// public:
+//     typedef OuterAlloc outer_allocator_type;
+//     typedef typename OuterTraits::size_type size_type;
+//     typedef typename OuterTraits::
diff erence_type 
diff erence_type;
+//     typedef typename OuterTraits::pointer pointer;
+//     typedef typename OuterTraits::const_pointer const_pointer;
+//     typedef typename OuterTraits::void_pointer void_pointer;
+//     typedef typename OuterTraits::const_void_pointer const_void_pointer;
+// };
+
+#include <scoped_allocator>
+#include <type_traits>
+
+#include "test_macros.h"
+#include "allocators.h"
+
+static_assert(std::is_base_of<A1<int>, std::scoped_allocator_adaptor<A1<int>> >::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::outer_allocator_type, A1<int>>::value, "");
+
+static_assert(
+    std::is_same<std::scoped_allocator_adaptor<A1<int>>::size_type, std::make_unsigned<std::ptr
diff _t>::type>::value,
+    "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::
diff erence_type, std::ptr
diff _t>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::pointer, int*>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::const_pointer, const int*>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::void_pointer, void*>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::const_void_pointer, const void*>::value, "");
+
+static_assert(std::is_base_of<A2<int>, std::scoped_allocator_adaptor<A2<int>, A1<int>> >::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::outer_allocator_type, A2<int>>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::size_type, unsigned>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::
diff erence_type, int>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::pointer, int*>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::const_pointer, const int*>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::void_pointer, void*>::value, "");
+
+static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::const_void_pointer, const void*>::value,
+              "");

diff  --git a/libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp b/libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp
deleted file mode 100644
index 768240984623..000000000000
--- a/libcxx/test/std/utilities/allocator.adaptor/types.pass.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: c++03
-
-// <memory>
-
-// template <class OuterAlloc, class... InnerAllocs>
-// class scoped_allocator_adaptor
-//     : public OuterAlloc
-// {
-// public:
-//     typedef OuterAlloc outer_allocator_type;
-//     typedef typename OuterTraits::size_type size_type;
-//     typedef typename OuterTraits::
diff erence_type 
diff erence_type;
-//     typedef typename OuterTraits::pointer pointer;
-//     typedef typename OuterTraits::const_pointer const_pointer;
-//     typedef typename OuterTraits::void_pointer void_pointer;
-//     typedef typename OuterTraits::const_void_pointer const_void_pointer;
-// };
-
-#include <scoped_allocator>
-#include <type_traits>
-
-#include "test_macros.h"
-#include "allocators.h"
-
-int main(int, char**) {
-  static_assert(std::is_base_of<A1<int>, std::scoped_allocator_adaptor<A1<int>> >::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::outer_allocator_type, A1<int>>::value, "");
-
-  static_assert(
-      std::is_same<std::scoped_allocator_adaptor<A1<int>>::size_type, std::make_unsigned<std::ptr
diff _t>::type>::value,
-      "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::
diff erence_type, std::ptr
diff _t>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::pointer, int*>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::const_pointer, const int*>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::void_pointer, void*>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A1<int>>::const_void_pointer, const void*>::value, "");
-
-  static_assert(std::is_base_of<A2<int>, std::scoped_allocator_adaptor<A2<int>, A1<int>> >::value, "");
-
-  static_assert(
-      std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::outer_allocator_type, A2<int>>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::size_type, unsigned>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::
diff erence_type, int>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::pointer, int*>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::const_pointer, const int*>::value, "");
-
-  static_assert(std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::void_pointer, void*>::value, "");
-
-  static_assert(
-      std::is_same<std::scoped_allocator_adaptor<A2<int>, A1<int>>::const_void_pointer, const void*>::value, "");
-
-  return 0;
-}