From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id F014F3858038 for ; Tue, 24 Aug 2021 13:44:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F014F3858038 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-fV3Y_7cyNHyvzV26G95tIQ-1; Tue, 24 Aug 2021 09:44:45 -0400 X-MC-Unique: fV3Y_7cyNHyvzV26G95tIQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E24087D543; Tue, 24 Aug 2021 13:44:43 +0000 (UTC) Received: from localhost (unknown [10.33.36.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FD695D9C6; Tue, 24 Aug 2021 13:44:43 +0000 (UTC) Date: Tue, 24 Aug 2021 14:44:42 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix mismatched class-key tags Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="gQDoBADyrPZQXuBY" Content-Disposition: inline X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2021 13:44:48 -0000 --gQDoBADyrPZQXuBY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Clang warns about this, but GCC doesn't (see PR c++/102036). Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * src/c++11/cxx11-shim_facets.cc: Fix mismatched class-key in explicit instantiation definitions. Tested powerpc64le-linux. Committed to trunk. --gQDoBADyrPZQXuBY Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit d8b7282ea27e02f687272cb8ea5f66ca900f1582 Author: Jonathan Wakely Date: Tue Aug 24 12:31:06 2021 libstdc++: Fix mismatched class-key tags Clang warns about this, but GCC doesn't (see PR c++/102036). Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * src/c++11/cxx11-shim_facets.cc: Fix mismatched class-key in explicit instantiation definitions. 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; - template class collate_shim; - template class moneypunct_shim; - template class moneypunct_shim; - template class money_get_shim; - template class money_put_shim; - template class messages_shim; + template struct numpunct_shim; + template struct collate_shim; + template struct moneypunct_shim; + template struct moneypunct_shim; + template struct money_get_shim; + template struct money_put_shim; + template struct messages_shim; #ifdef _GLIBCXX_USE_WCHAR_T - template class numpunct_shim; - template class collate_shim; - template class moneypunct_shim; - template class moneypunct_shim; - template class money_get_shim; - template class money_put_shim; - template class messages_shim; + template struct numpunct_shim; + template struct collate_shim; + template struct moneypunct_shim; + template struct moneypunct_shim; + template struct money_get_shim; + template struct money_put_shim; + template struct messages_shim; #endif template --gQDoBADyrPZQXuBY--