From 2f13e790839f1b3f975a254ffd4c29a171ab9204 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Thu, 16 Nov 2017 05:48:32 +0000 Subject: [PATCH] More of P0600 - '[[nodiscard]] in the Library' mark empty() as nodiscard in filesystem::path llvm-svn: 318378 --- libcxx/include/experimental/filesystem | 3 ++- .../path.member/path.decompose/empty.fail.cpp | 28 ++++++++++++++++++++++ .../path.decompose/path.decompose.pass.cpp | 3 ++- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 libcxx/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp diff --git a/libcxx/include/experimental/filesystem b/libcxx/include/experimental/filesystem index 747f62f..674490f 100644 --- a/libcxx/include/experimental/filesystem +++ b/libcxx/include/experimental/filesystem @@ -972,7 +972,8 @@ public: _LIBCPP_INLINE_VISIBILITY path extension() const { return string_type(__extension()); } // query - _LIBCPP_INLINE_VISIBILITY bool empty() const _NOEXCEPT { return __pn_.empty(); } + _LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY + bool empty() const _NOEXCEPT { return __pn_.empty(); } _LIBCPP_INLINE_VISIBILITY bool has_root_name() const { return !__root_name().empty(); } _LIBCPP_INLINE_VISIBILITY bool has_root_directory() const { return !__root_directory().empty(); } diff --git a/libcxx/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp b/libcxx/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp new file mode 100644 index 0000000..7e1fea7 --- /dev/null +++ b/libcxx/test/std/experimental/filesystem/class.path/path.member/path.decompose/empty.fail.cpp @@ -0,0 +1,28 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// class path + +// bool empty() const noexcept; + +// UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8 + +#include + +#include "test_macros.h" + +int main () +{ + std::experimental::filesystem::path c; + c.empty(); // expected-error {{ignoring return value of function declared with 'nodiscard' attribute}} +} diff --git a/libcxx/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp b/libcxx/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp index 078e006..823865b 100644 --- a/libcxx/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp +++ b/libcxx/test/std/experimental/filesystem/class.path/path.member/path.decompose/path.decompose.pass.cpp @@ -177,7 +177,8 @@ void decompFilenameTest() for (auto const & TC : FilenameTestCases) { path p(TC.raw); assert(p == TC.raw); - + ASSERT_NOEXCEPT(p.empty()); + assert(p.filename() == TC.filename); assert(p.has_filename() != TC.filename.empty()); -- 2.7.4