[gcc/devel/omp/gcc-9] Fix C++14-only code in testsuite utility

Tobias Burnus burnus@gcc.gnu.org
Thu Mar 5 13:54:00 GMT 2020


https://gcc.gnu.org/g:9c0c04ee74a846a22ce6cc52035e0ea2807f29ad

commit 9c0c04ee74a846a22ce6cc52035e0ea2807f29ad
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue May 28 21:48:23 2019 +0100

    Fix C++14-only code in testsuite utility
    
    	* testsuite/util/testsuite_fs.h (compare_paths): Use three-argument
    	form of std::equals for C++11 compatibility.
    
    From-SVN: r271718

Diff:
---
 libstdc++-v3/ChangeLog                     | 8 ++++++++
 libstdc++-v3/testsuite/util/testsuite_fs.h | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2a831d4..59e1bb2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2019-05-28  Jonathan Wakely  <jwakely@redhat.com>
+
+	Backport from mainline
+	2019-05-28  Jonathan Wakely  <jwakely@redhat.com>
+
+	* testsuite/util/testsuite_fs.h (compare_paths): Use three-argument
+	form of std::equals for C++11 compatibility.
+
 2019-05-24  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backport from mainline
diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h
index b2a5ee6..fe42845 100644
--- a/libstdc++-v3/testsuite/util/testsuite_fs.h
+++ b/libstdc++-v3/testsuite/util/testsuite_fs.h
@@ -67,9 +67,9 @@ namespace __gnu_test
       throw test_fs::filesystem_error(
 	  "distance(begin1, end1) != distance(begin2, end2)", p1, p2,
 	  std::make_error_code(std::errc::invalid_argument) );
-    if (!std::equal(p1.begin(), p1.end(), p2.begin(), p2.end()))
+    if (!std::equal(p1.begin(), p1.end(), p2.begin()))
       throw test_fs::filesystem_error(
-	  "!equal(begin1, end1, begin2, end2)", p1, p2,
+	  "!equal(begin1, end1, begin2)", p1, p2,
 	  std::make_error_code(std::errc::invalid_argument) );
 
   }



More information about the Libstdc++-cvs mailing list