head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.108
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.106
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.104
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.102
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.100
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.98
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.96
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.94
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.92
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.90
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.88
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.86
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.84
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.82
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.80
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.78
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.76
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.74
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.72
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.70
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.68
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.66
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.64
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.60
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.40
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.62
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.58
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.56
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.54
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.52
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.50
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.48
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.46
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.44
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.42
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.38
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.36
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.34
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.32
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.30
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.28
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.26
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.24
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.22
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.20
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.18
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.16
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.14
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.12
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.10
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.8
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.6
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.4
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.2
	pkgsrc-2012Q4-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2012.12.21.10.29.46;	author dholland;	state Exp;
branches;
next	;


desc
@@


1.1
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 *

--- doctype/dif.cxx~	2000-10-12 20:55:25.000000000 +0000
+++ doctype/dif.cxx
@@@@ -9,13 +9,13 @@@@ Author:		Archie Warnock, warnock@@clark.n
 		Enhancements by Ken Lambert Hughes STX 3/97
 		Enhancements by Chris Gokey Hughes STX 3/98
 @@@@@@*/
-#include <iostream.h>
-#include <fstream.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
+#include <iostream>
+#include <fstream>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+#include <cctype>
 #include "isearch.hxx"
 #include "glist.hxx"
 #include "gstack.hxx"
@@@@ -76,7 +76,7 @@@@ char multilineGroup[NO_MULTILINE_GROUPS]
                                                  "Project_Text",
                                                  "Source_Text",
                                                  "Sensor_Text" };
-void dbg(char *s) {
+void dbg(const char *s) {
   // printf("%s\n",s);
 }
 /* ========================= FROM FGDC doctype ========================*/
@@@@ -101,11 +101,11 @@@@ void DIF::LoadFieldTable() {
   Db->GetDocTypeOptions(&StrList);
   StrList.GetValue("FIELDTYPE", &FieldTypeFilename);
   if (FieldTypeFilename.GetLength() == 0) {
-    cout << "No fieldtype file specified.  Assuming all fields are text.";
-    cout << endl;
-    cout << "Make sure you use the correct doctype option:" << endl;
-    cout << endl;
-    cout << "    -o fieldtype=<filename>" << endl;
+    std::cout << "No fieldtype file specified.  Assuming all fields are text.";
+    std::cout << std::endl;
+    std::cout << "Make sure you use the correct doctype option:" << std::endl;
+    std::cout << std::endl;
+    std::cout << "    -o fieldtype=<filename>" << std::endl;
     return;
   }
   STRING Field_and_Type;
@@@@ -114,11 +114,11 @@@@ void DIF::LoadFieldTable() {
   PFILE fp = fopen(FieldTypeFilename, "r");
   // Let's bring the entire file into memory
   if (!fp) {
-    cout << "Specified fieldtype file not found.  Assuming all fields are text.";
-    cout << endl;
-    cout << "Make sure you use the correct doctype option:" << endl;
-    cout << endl;
-    cout << "    -o fieldtype=<filename>" << endl;
+    std::cout << "Specified fieldtype file not found.  Assuming all fields are text.";
+    std::cout << std::endl;
+    std::cout << "Make sure you use the correct doctype option:" << std::endl;
+    std::cout << std::endl;
+    std::cout << "    -o fieldtype=<filename>" << std::endl;
     return;
   }
   fseek(fp, 0, 2);
@@@@ -192,9 +192,9 @@@@ void DIF::ParseDate(const CHR *Buffer, D
 DOUBLE DIF::ParseDateSingle(const CHR *Buffer) {
   DOUBLE fVal;
   STRING Hold;
-  cout << "Parse Single Date:" << fVal << endl;
+  std::cout << "Parse Single Date:" << fVal << std::endl;
 #ifdef DEBUG
-  cout << "Parse Single Date." << endl;
+  std::cout << "Parse Single Date." << std::endl;
 #endif
   Hold = Buffer;
   //cout << "Hold = " << Hold << "." << endl;
@@@@ -207,7 +207,7 @@@@ DOUBLE DIF::ParseDateSingle(const CHR *B
   else if (Hold.IsNumber())
     fVal = Hold.GetFloat();
   else {
-    cout << "Bad date, value=" << Buffer << endl;
+    std::cout << "Bad date, value=" << Buffer << std::endl;
     fVal = -1.0;
   }
   if (fVal == 0) fVal = 99999999;
@@@@ -243,14 +243,14 @@@@ DIF::ParseDateRange(const CHR *Buffer, D
       }
       *fStart = dStart.GetValue();
     } else {
-      cerr << "[DIF::ParseDateRange] Didn't parse START_DATE, value=" 
-	   << Hold << endl;
+      std::cerr << "[DIF::ParseDateRange] Didn't parse START_DATE, value="
+	   << Hold << std::endl;
       *fStart = DATE_ERROR;
     }
   }
   else {
-    cerr << "[DIF::ParseDateRange] Didn't parse START_DATE, value=" 
-	 << Hold << endl;
+    std::cerr << "[DIF::ParseDateRange] Didn't parse START_DATE, value=" 
+	 << Hold << std::endl;
     *fStart = DATE_ERROR;
     *fEnd = *fStart;
     return;
@@@@ -795,7 +795,7 @@@@ void DIF::textML() {
   parserError("Error: expected text or end_group");
   dbg("</textML>");
 }
-void DIF::parserError(char *s) {  /* Parser error. */
+void DIF::parserError(const char *s) {  /* Parser error. */
 	fprintf(stdout,"***** %s ***** \n", s);
 }
 /*
@