From 05761e6861df930b3f040721c76aa3f829974cfe Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 17 Jun 2016 19:57:54 +0000 Subject: [PATCH] Fix a couple of warnings present in the filesystem tests. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@273035 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../directory_iterator.members/move_assign.pass.cpp | 6 ++++++ .../path.member/path.modifiers/replace_extension.pass.cpp | 8 ++++---- .../rec.dir.itr.members/move_assign.pass.cpp | 6 ++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp b/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp index 6c766ef2e..445f05a3c 100644 --- a/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp +++ b/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp @@ -24,6 +24,12 @@ #include "rapid-cxx-test.hpp" #include "filesystem_test_helper.hpp" +// The filesystem specification explicitly allows for self-move on +// the directory iterators. Turn off this warning so we can test it. +#if defined(__clang__) +#pragma clang diagnostic ignored "-Wself-move" +#endif + using namespace std::experimental::filesystem; TEST_SUITE(directory_iterator_move_assign_tests) diff --git a/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp b/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp index 3dd218411..98f6e9b88 100644 --- a/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp +++ b/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp @@ -47,10 +47,10 @@ const ReplaceExtensionTestcase TestCases[] = }; const ReplaceExtensionTestcase NoArgCases[] = { - {"", ""} - , {"foo", "foo"} - , {"foo.cpp", "foo"} - , {"foo..cpp", "foo."} + {"", "", ""} + , {"foo", "foo", ""} + , {"foo.cpp", "foo", ""} + , {"foo..cpp", "foo.", ""} }; int main() diff --git a/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp b/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp index a2dd03f5b..915d00267 100644 --- a/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp +++ b/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp @@ -24,6 +24,12 @@ #include "rapid-cxx-test.hpp" #include "filesystem_test_helper.hpp" +// The filesystem specification explicitly allows for self-move on +// the directory iterators. Turn off this warning so we can test it. +#if defined(__clang__) +#pragma clang diagnostic ignored "-Wself-move" +#endif + using namespace std::experimental::filesystem; TEST_SUITE(recursive_directory_iterator_move_assign_tests)