From: Jonathan Wakely <jwakely@redhat.com>
Date: Sun, 19 Apr 2020 19:54:38 +0000 (+0100)
Subject: libstdc++: Fix redundant assignment (PR 94629)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a2c0fa35d0dc8912b0c1a658234221de61e60840;p=gcc.git

libstdc++: Fix redundant assignment (PR 94629)

This appears to be a copy&paste error, which cppcheck diagnoses.

	PR other/94629
	* include/debug/formatter.h (_Error_formatter::_Parameter): Fix
	redundant assignment in constructor.
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 40345cc7044..8d5f0a12fd6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2020-04-19  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR other/94629
+	* include/debug/formatter.h (_Error_formatter::_Parameter): Fix
+	redundant assignment in constructor.
+
 2020-04-18  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/std/chrono (duration, time_point): Define operator<=> and
diff --git a/libstdc++-v3/include/debug/formatter.h b/libstdc++-v3/include/debug/formatter.h
index 998f8056601..bb9b3e5653a 100644
--- a/libstdc++-v3/include/debug/formatter.h
+++ b/libstdc++-v3/include/debug/formatter.h
@@ -299,7 +299,6 @@ namespace __gnu_debug
 	  _M_variant._M_iterator._M_name = __name;
 	  _M_variant._M_iterator._M_address = std::__addressof(__it);
 	  _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(_Iterator);
-	  _M_variant._M_iterator._M_constness =
 	  _M_variant._M_iterator._M_constness =
 	    __it._S_constant() ? __const_iterator : __mutable_iterator;
 	  _M_variant._M_iterator._M_sequence = __it._M_get_sequence();