Wed Mar 18 17:57:31 2020 UTC ()

Help the compiler find the right insert


(joerg)

diff -r1.25 -r1.26 pkgsrc/math/qalculate/distinfo
diff -r0 -r1.1 pkgsrc/math/qalculate/patches/patch-libqalculate_Number.cc

--- pkgsrc/math/qalculate/distinfo 2019/12/09 09:31:06 1.25
+++ pkgsrc/math/qalculate/distinfo 2020/03/18 17:57:30 1.26

 @@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.25 2019/12/09 09:31:06 nros Exp $
+$NetBSD: distinfo,v 1.26 2020/03/18 17:57:30 joerg Exp $
 SHA1 (libqalculate-3.5.0a.tar.gz) = fcf76bc5a74236bff5b6ae6f0543ab13296bc34d
 RMD160 (libqalculate-3.5.0a.tar.gz) = 6152daebee96026ffae7349198e72f991d85f5eb
 SHA512 (libqalculate-3.5.0a.tar.gz) = 1af5cdbcac8161aaf3fec56830bebd933b60537d1a27beab01039a4232e20e54c044c799cb1681d31b63c1b8a31f5902bcfa328a25f313566bf6171577430071
 Size (libqalculate-3.5.0a.tar.gz) = 2126070 bytes
 SHA1 (patch-configure.ac) = f5241d62bbc3f278d30813d8305c28c10b207b00
 SHA1 (patch-libqalculate_Number.cc) = 12fe1a6be524c0a1cf34c02f97ac862138c5ab91
 SHA1 (patch-libqalculate_util.cc) = 300e2dd75c28ae2fdfb95ece96b400d5d67a3aac

$NetBSD: patch-libqalculate_Number.cc,v 1.1 2020/03/18 17:57:31 joerg Exp $

Ensure that the third argument is the base type of the string,
so that insert is unambigous from the iterator variation.

--- libqalculate/Number.cc.orig	2020-03-15 17:27:02.908147193 +0000
+++ libqalculate/Number.cc
@@ -7723,7 +7723,7 @@ string Number::print(const PrintOptions 
 			nra *= 26;
 			nra = nr - nra;
 			nr = nri;
-			str.insert(0, 1, ('A' + nra.intValue() - 1));
+			str.insert(0, 1, char('A' + nra.intValue() - 1));
 		} while(!nr.isZero());
 		if(ips.minus) {
 			*ips.minus = neg;