Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 3C2E87A2A7 for ; Tue, 14 Feb 2017 21:27:06 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E131E855CF; Tue, 14 Feb 2017 21:27:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 715BE8557C for ; Tue, 14 Feb 2017 21:27:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 04Q2d26-iUfq for ; Tue, 14 Feb 2017 21:27:05 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C4C2384CDE for ; Tue, 14 Feb 2017 21:27:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C3235FBE3; Tue, 14 Feb 2017 21:27:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148710762456980" MIME-Version: 1.0 Date: Tue, 14 Feb 2017 21:27:04 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/math/ordCalc To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20170214212704.C3235FBE3@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148710762456980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Feb 14 21:27:04 UTC 2017 Modified Files: pkgsrc/math/ordCalc: Makefile distinfo pkgsrc/math/ordCalc/patches: patch-ac Log Message: Pointers are not ordered relative to 0, so compare the elements as likely intended. Bump revision. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/ordCalc/Makefile \ pkgsrc/math/ordCalc/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/ordCalc/patches/patch-ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148710762456980 Content-Disposition: inline Content-Length: 2723 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/ordCalc/Makefile diff -u pkgsrc/math/ordCalc/Makefile:1.10 pkgsrc/math/ordCalc/Makefile:1.11 --- pkgsrc/math/ordCalc/Makefile:1.10 Tue Aug 18 07:31:12 2015 +++ pkgsrc/math/ordCalc/Makefile Tue Feb 14 21:27:04 2017 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2015/08/18 07:31:12 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2017/02/14 21:27:04 joerg Exp $ # ORDCALCVER= 0.2 PKGNAME= ordCalc-${ORDCALCVER} DISTNAME= ordCalc_${ORDCALCVER} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= math MASTER_SITES= http://mtnmath.com/ord/ EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/math/ordCalc/distinfo diff -u pkgsrc/math/ordCalc/distinfo:1.10 pkgsrc/math/ordCalc/distinfo:1.11 --- pkgsrc/math/ordCalc/distinfo:1.10 Tue Nov 3 23:33:37 2015 +++ pkgsrc/math/ordCalc/distinfo Tue Feb 14 21:27:04 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 23:33:37 agc Exp $ +$NetBSD: distinfo,v 1.11 2017/02/14 21:27:04 joerg Exp $ SHA1 (ordCalc_0.2.tar.bz2) = 6b3e1e5b714cc50d1e2c48b8f06b8dd41fbde134 RMD160 (ordCalc_0.2.tar.bz2) = caf9c89a2a54fe3e5414cb7f1e1a4e1d4aad0397 @@ -6,7 +6,7 @@ SHA512 (ordCalc_0.2.tar.bz2) = 7a8d3b9f8 Size (ordCalc_0.2.tar.bz2) = 1123521 bytes SHA1 (patch-aa) = 06099a685082adf353c9902713acc0dc485d6d74 SHA1 (patch-ab) = 0adfeaa3a1018d3197a26480e9a736e7d9da962d -SHA1 (patch-ac) = a716cc6dc42d46b5c9c0d0fe5bda8a226ab71638 +SHA1 (patch-ac) = 125934abe1773365f8121f93466ec7b524853c99 SHA1 (patch-ad) = e8a1fa4fcfdf8d43d70f614ef63127885dc885b4 SHA1 (patch-src_intfc.cpp) = e2d8f2d2e374c9eda118cd281126c416a7976774 SHA1 (patch-src_intfc.h) = dbb95eb44fc3abe01fdcabaf824790915117d09c Index: pkgsrc/math/ordCalc/patches/patch-ac diff -u pkgsrc/math/ordCalc/patches/patch-ac:1.1 pkgsrc/math/ordCalc/patches/patch-ac:1.2 --- pkgsrc/math/ordCalc/patches/patch-ac:1.1 Sat Jan 23 23:21:45 2010 +++ pkgsrc/math/ordCalc/patches/patch-ac Tue Feb 14 21:27:04 2017 @@ -1,4 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2010/01/23 23:21:45 is Exp $ +$NetBSD: patch-ac,v 1.2 2017/02/14 21:27:04 joerg Exp $ + +Pointers are not ordered. Fix the code to actually compare to the element +and not a promoted boolean. --- src/ordinal.cpp.orig 2010-01-17 04:51:35.000000000 +0000 +++ src/ordinal.cpp @@ -11,3 +14,12 @@ $NetBSD: patch-ac,v 1.1 2010/01/23 23:21 { } +@@ -1420,7 +1420,7 @@ const Ordinal& ord::finiteFunctionalTest + if (params[index]->getImpl().psuedoCodeLevel() == + CantorNormalElement::cantorCodeLevel) continue ; + if (maxIndex < 0) maxIndex = index ; +- else if (params[maxIndex]->compare(params[index]<0)) maxIndex = index ; ++ else if (params[maxIndex]->compare(*params[index]) < 0) maxIndex = index ; + } + if (maxIndex >= 0) { + bool maxPredNz = false ; --_----------=_148710762456980--