head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.108 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.106 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.104 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.102 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.100 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.98 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.96 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.94 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.92 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.90 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.88 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.86 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.84 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.82 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.80 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.78 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.76 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.74 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.72 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.70 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.68 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.66 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.64 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.60 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.40 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.62 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.58 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.56 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.54 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.52 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.50 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.48 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.46 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.44 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.42 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.38 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.36 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.34 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.32 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.30 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.28 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.26 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.24 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.22 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.20 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.18 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.16 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.14 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.12 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.10 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.8 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.6 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.1.0.72 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.70 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.68 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.66 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.64 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.62 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.60 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.58 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.56 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.54 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.52 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.50 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.48 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.46 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.44 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.42 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.40 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.38 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.36 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.34 pkgsrc-2008Q1:1.1.0.32 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.30 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.28 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.26 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.24 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.22 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.20 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.18 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.16 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.14 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.12 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.10 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.8 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.6 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.4 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2012.12.21.10.29.46; author dholland; state Exp; branches; next 1.1; 1.1 date 2004.05.23.22.33.17; author kristerw; state Exp; branches; next ; desc @@ 1.2 log @Chase after that moving target known lightly as the C++ "standard". Fixes build. Also clean up insecure-temporary-files. PKGREVISION -> 1. @ text @$NetBSD$ Chase after the C++ standard: - use the newfangled names for C++ headers - use "std" qualification - string constants are const char * Use 0, not (char)NULL. --- src/string.cxx.orig 2000-10-31 06:22:09.000000000 +0000 +++ src/string.cxx @@@@ -42,17 +42,17 @@@@ Description: Class STRING Author: Nassib Nassar, nrn@@cnidr.org @@@@@@*/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #ifdef UNIX #include #include -#include +#include #endif #include "common.hxx" @@@@ -573,13 +573,13 @@@@ STRING::Print(PFILE FilePointer) const { // can this be const STRING& ? -ostream& operator<<(ostream& os, const STRING& str) { - os.write(str.Buffer, str.Length); +std::ostream& operator<<(std::ostream& os, const STRING& str) { + os.write((const char*)str.Buffer, str.Length); return os; } -istream& operator>>(istream& is, STRING& str) { +std::istream& operator>>(std::istream& is, STRING& str) { CHR buf[256]; // is >> buf; is.getline(buf,255); @@@@ -1145,7 +1145,7 @@@@ STRING::XmlCleanup() { } */ -char *translate[] = { +const char *translate[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@@@ -1179,7 +1179,7 @@@@ STRING::XmlCleanup() { Replace("'","\'"); newstr=transcode((CHR*)Buffer, translate); - Length = BufferSize = 0; + Length= BufferSize = 0; Copy((UCHR*)newstr, strlen(newstr)); delete [] newstr; @@@@ -1195,7 +1195,7 @@@@ STRING::XmlCleanup() { * the buffer is 6 times the original string length * By John HLB Tyler (Credit please?) */ -char *transcode (char *buffer, char **transarray) +char *transcode (char *buffer, const char **transarray) { char *obuf=buffer; /* Beginning of old buffer */ char *obufscan=obuf; /* Scanning point of old buffer */ @@@@ -1203,7 +1203,7 @@@@ char *transcode (char *buffer, char **tr char *nbuf; /* Pointer to start of new string buffer */ char *ipnt; /* Insertion point into new buffer */ char *maxipnt; /* End of new buffer */ - char *rscan; /* Pointer to a character in the replacement */ + const char *rscan; /* Pointer to a character in the replacement */ nbuf = new char [lennbuf]; /* Pointer to start of new string buffer */ ipnt=nbuf; @@@@ -1215,7 +1215,7 @@@@ char *transcode (char *buffer, char **tr if (transarray[*obufscan]) { //Yes for (rscan=transarray[*obufscan]; - *rscan!=(char)NULL && ipnt