From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 28 May 2019 19:39:41 +0000 (+0100)
Subject: Fix C++14-only code in testsuite utility
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d9b401df8f3eda8bcb647cae0c07c9bd19bff00b;p=gcc.git

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 2f1254b3a78..60a504b2d72 100644
--- 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 b2a5ee6e655..fe42845ac4f 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) );
 
   }