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: r271716

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f1254b3a78425e31fce4dbf32eae4f59d04e713..60a504b2d72d6f8a07749a82c2b6c37532861c3c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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-26  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * doc/xml/manual/appendix_contributing.xml: Update pointer to

diff --git a/libstdc++-v3/testsuite/util/testsuite_fs.h b/libstdc++-v3/testsuite/util/testsuite_fs.h
index b2a5ee6e65528d7f86ffafea27a966d2e82b812c..fe42845ac4f03ab3e5a685cc3333bfa0e243f074 100644 (file)
--- 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) );
 
   }