From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
 id 8B2A0385842A; Tue, 24 Aug 2021 13:43:47 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B2A0385842A
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-3118] libstdc++: Fix mismatched class-key tags
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 6e5401e87d02919b0594e04f828892deef956407
X-Git-Newrev: d8b7282ea27e02f687272cb8ea5f66ca900f1582
Message-Id: <20210824134347.8B2A0385842A@sourceware.org>
Date: Tue, 24 Aug 2021 13:43:47 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Aug 2021 13:43:47 -0000

https://gcc.gnu.org/g:d8b7282ea27e02f687272cb8ea5f66ca900f1582

commit r12-3118-gd8b7282ea27e02f687272cb8ea5f66ca900f1582
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Aug 24 12:31:06 2021 +0100

    libstdc++: Fix mismatched class-key tags
    
    Clang warns about this, but GCC doesn't (see PR c++/102036).
    
    Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
    
    libstdc++-v3/ChangeLog:
    
            * src/c++11/cxx11-shim_facets.cc: Fix mismatched class-key in
            explicit instantiation definitions.

Diff:
---
 libstdc++-v3/src/c++11/cxx11-shim_facets.cc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/libstdc++-v3/src/c++11/cxx11-shim_facets.cc b/libstdc++-v3/src/c++11/cxx11-shim_facets.cc
index 3aa085b8aa7..ba87740d57e 100644
--- a/libstdc++-v3/src/c++11/cxx11-shim_facets.cc
+++ b/libstdc++-v3/src/c++11/cxx11-shim_facets.cc
@@ -469,21 +469,21 @@ namespace __facet_shims
 	}
       };
 
-    template class numpunct_shim<char>;
-    template class collate_shim<char>;
-    template class moneypunct_shim<char, true>;
-    template class moneypunct_shim<char, false>;
-    template class money_get_shim<char>;
-    template class money_put_shim<char>;
-    template class messages_shim<char>;
+    template struct numpunct_shim<char>;
+    template struct collate_shim<char>;
+    template struct moneypunct_shim<char, true>;
+    template struct moneypunct_shim<char, false>;
+    template struct money_get_shim<char>;
+    template struct money_put_shim<char>;
+    template struct messages_shim<char>;
 #ifdef _GLIBCXX_USE_WCHAR_T
-    template class numpunct_shim<wchar_t>;
-    template class collate_shim<wchar_t>;
-    template class moneypunct_shim<wchar_t, true>;
-    template class moneypunct_shim<wchar_t, false>;
-    template class money_get_shim<wchar_t>;
-    template class money_put_shim<wchar_t>;
-    template class messages_shim<wchar_t>;
+    template struct numpunct_shim<wchar_t>;
+    template struct collate_shim<wchar_t>;
+    template struct moneypunct_shim<wchar_t, true>;
+    template struct moneypunct_shim<wchar_t, false>;
+    template struct money_get_shim<wchar_t>;
+    template struct money_put_shim<wchar_t>;
+    template struct messages_shim<wchar_t>;
 #endif
 
     template<typename C>