mclow.lists created this revision.
mclow.lists added a reviewer: EricWF.
According to
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0433r2.html
Once this is reviewed, I'll do the rest of the sequence containers.
https://reviews.llvm.org/D46964
Files:
include/array
test/std/containers/sequences/array/array.cons/deduct.fail.cpp
test/std/containers/sequences/array/array.cons/deduct.pass.cpp
Index: test/std/containers/sequences/array/array.cons/deduct.pass.cpp
===================================================================
--- test/std/containers/sequences/array/array.cons/deduct.pass.cpp
+++ test/std/containers/sequences/array/array.cons/deduct.pass.cpp
@@ -0,0 +1,45 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <array>
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+// XFAIL: libcpp-no-deduction-guides
+
+
+// template <class T, class... U>
+// array(T, U...) -> array<T, 1 + sizeof...(U)>;
+//
+// Requires: (is_same_v<T, U> && ...) is true. Otherwise the program is ill-formed.
+
+
+#include <array>
+#include <cassert>
+#include <cstddef>
+
+#include "test_macros.h"
+
+int main()
+{
+ {
+ std::array arr{1,2,3};
+ static_assert(std::is_same_v<decltype(arr), std::array<int, 3>>, "");
+ assert(arr[0] == 1);
+ assert(arr[1] == 2);
+ assert(arr[2] == 3);
+ }
+
+ {
+ std::array arr{1L, 4L, 9L, 16L};
+ static_assert(std::is_same_v<decltype(arr)::value_type, long>, "");
+ static_assert(arr.size() == 4, "");
+ assert(arr[0] == 1);
+ assert(arr[1] == 4);
+ assert(arr[2] == 9);
+ }
+}
Index: test/std/containers/sequences/array/array.cons/deduct.fail.cpp
===================================================================
--- test/std/containers/sequences/array/array.cons/deduct.fail.cpp
+++ test/std/containers/sequences/array/array.cons/deduct.fail.cpp
@@ -0,0 +1,32 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <array>
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+// XFAIL: libcpp-no-deduction-guides
+
+
+// template <class T, class... U>
+// array(T, U...) -> array<T, 1 + sizeof...(U)>;
+//
+// Requires: (is_same_v<T, U> && ...) is true. Otherwise the program is ill-formed.
+
+
+#include <array>
+#include <cassert>
+#include <cstddef>
+
+#include "test_macros.h"
+
+int main()
+{
+ {
+ std::array arr{1,2,3L}; // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'array'}}
+ }
+}
Index: include/array
===================================================================
--- include/array
+++ include/array
@@ -72,6 +72,9 @@
const T* data() const noexcept;
};
+ template <class T, class... U>
+ array(T, U...) -> array<T, 1 + sizeof...(U)>;
+
template <class T, size_t N>
bool operator==(const array<T,N>& x, const array<T,N>& y);
template <class T, size_t N>
@@ -354,6 +357,14 @@
};
+#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
+template<class _Tp, class... _Args,
+ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), void>::type
+ >
+array(_Tp, _Args...)
+ -> array<_Tp, 1 + sizeof...(_Args)>;
+#endif
+
template <class _Tp, size_t _Size>
inline _LIBCPP_INLINE_VISIBILITY
bool
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
