diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-03-06 21:02:06 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-03-06 21:02:06 +0000 |
| commit | bc9cbcedc16687e66a24ac5a36f6a1763d79e92f (patch) | |
| tree | 50349e668c917154edc847b03e0c36467601f341 /libcxx | |
| parent | 1e254c5295502526362efa1757359fdfaf92495d (diff) | |
| download | bcm5719-llvm-bc9cbcedc16687e66a24ac5a36f6a1763d79e92f.tar.gz bcm5719-llvm-bc9cbcedc16687e66a24ac5a36f6a1763d79e92f.zip | |
Implement LWG 2787 - [file_status.cons] is inconsistent
llvm-svn: 297071
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/experimental/filesystem | 6 | ||||
| -rw-r--r-- | libcxx/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp | 4 | ||||
| -rw-r--r-- | libcxx/www/cxx1z_status.html | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libcxx/include/experimental/filesystem b/libcxx/include/experimental/filesystem index 6ce446f7c5f..cf62ca27ab8 100644 --- a/libcxx/include/experimental/filesystem +++ b/libcxx/include/experimental/filesystem @@ -408,8 +408,10 @@ class _LIBCPP_TYPE_VIS file_status public: // constructors _LIBCPP_INLINE_VISIBILITY - explicit file_status(file_type __ft = file_type::none, - perms __prms = perms::unknown) _NOEXCEPT + file_status() _NOEXCEPT : file_status(file_type::none) {} + _LIBCPP_INLINE_VISIBILITY + explicit file_status(file_type __ft, + perms __prms = perms::unknown) _NOEXCEPT : __ft_(__ft), __prms_(__prms) {} diff --git a/libcxx/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp b/libcxx/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp index 585b0bb1dd5..a744e659f5b 100644 --- a/libcxx/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/class.file_status/file_status.cons.pass.cpp @@ -30,8 +30,8 @@ int main() { { static_assert(std::is_nothrow_default_constructible<file_status>::value, "The default constructor must be noexcept"); - static_assert(!test_convertible<file_status>(), - "The default constructor must be explicit"); + static_assert(test_convertible<file_status>(), + "The default constructor must not be explicit"); const file_status f; assert(f.type() == file_type::none); assert(f.permissions() == perms::unknown); diff --git a/libcxx/www/cxx1z_status.html b/libcxx/www/cxx1z_status.html index d8923edea95..ab796adca18 100644 --- a/libcxx/www/cxx1z_status.html +++ b/libcxx/www/cxx1z_status.html @@ -439,7 +439,7 @@ <tr><td><a href="http://wg21.link/LWG2784">2784</a></td><td>Resolution to LWG 2484 is missing "otherwise, no effects" and is hard to parse</td><td>Kona</td><td></td></tr> <tr><td><a href="http://wg21.link/LWG2785">2785</a></td><td>quoted should work with basic_string_view</td><td>Kona</td><td></td></tr> <tr><td><a href="http://wg21.link/LWG2786">2786</a></td><td>Annex C should mention shared_ptr changes for array support</td><td>Kona</td><td></td></tr> - <tr><td><a href="http://wg21.link/LWG2787">2787</a></td><td>§[file_status.cons] doesn't match class definition</td><td>Kona</td><td></td></tr> + <tr><td><a href="http://wg21.link/LWG2787">2787</a></td><td>§[file_status.cons] doesn't match class definition</td><td>Kona</td><td>Complete</td></tr> <tr><td><a href="http://wg21.link/LWG2788">2788</a></td><td>basic_string range mutators unintentionally require a default constructible allocator</td><td>Kona</td><td></td></tr> <tr><td><a href="http://wg21.link/LWG2789">2789</a></td><td>Equivalence of contained objects</td><td>Kona</td><td></td></tr> <tr><td><a href="http://wg21.link/LWG2790">2790</a></td><td>Missing specification of istreambuf_iterator::operator-></td><td>Kona</td><td></td></tr> |
