From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id 1AD893954407; Wed, 17 Jun 2020 18:56:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1AD893954407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592420185; bh=GIvl0l/KxX6UquMVAXNlvV7LT4abq9QhILgCQW9pGZw=; h=From:To:Subject:Date:From; b=CJXXL0Tvv1wj8Cyt09ai2EGbUquutz1XVFXovyCxkHugdfdNAza6ePiWcFBPpI6pZ kmmX0qWvvJXCmtme8rXyaJeU1Bu4Od51sn5wFgBtSjA2NykuP1mhSsl1iK0rx3nBUQ eNyf7U6IiuyE9xRAICw2GXpFtaKDPpiqcKgWayEc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/ranger] libstdc++: Fix regression in libstdc++-prettyprinters/cxx20.cc X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/ranger X-Git-Oldrev: d6dfa3dafc0a69a84002f1c0be17a70b0996cc72 X-Git-Newrev: 4540ef781bcefffe779a8b31950ea737733f06a4 Message-Id: <20200617185625.1AD893954407@sourceware.org> Date: Wed, 17 Jun 2020 18:56:25 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2020 18:56:25 -0000 https://gcc.gnu.org/g:4540ef781bcefffe779a8b31950ea737733f06a4 commit 4540ef781bcefffe779a8b31950ea737733f06a4 Author: Jonathan Wakely Date: Mon Feb 17 13:20:57 2020 +0000 libstdc++: Fix regression in libstdc++-prettyprinters/cxx20.cc * python/libstdcxx/v6/printers.py (StdCmpCatPrinter.to_string): Update value for partial_ordering::unordered. Diff: --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/python/libstdcxx/v6/printers.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c9660084179..9ae1e112aa8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2020-02-17 Jonathan Wakely + * python/libstdcxx/v6/printers.py (StdCmpCatPrinter.to_string): Update + value for partial_ordering::unordered. + * include/bits/iterator_concepts.h (indirectly_copyable_storable): Add const-qualified expression variations. * include/std/concepts (copyable): Likewise. diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 7f69b0be9f1..e4da8dfe5b6 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -1435,7 +1435,7 @@ class StdCmpCatPrinter: if self.typename == 'strong_ordering' and self.val == 0: name = 'equal' else: - names = {-127:'unordered', -1:'less', 0:'equivalent', 1:'greater'} + names = {2:'unordered', -1:'less', 0:'equivalent', 1:'greater'} name = names[int(self.val)] return 'std::{}::{}'.format(self.typename, name)