$NetBSD: patch-an,v 1.3 2012/03/07 16:11:30 adam Exp $

--- cxx/nctst.cpp.orig	2011-06-30 23:22:19.000000000 +0000
+++ cxx/nctst.cpp
@@ -369,12 +369,12 @@ void DumpableNcFile::dumpdims( void )
 
     for (int n=0; n < num_dims(); n++) {
 	NcDim* dim = get_dim(n);
-	cout << "\t" << dim->name() << " = " ;
+	std::cout << "\t" << dim->name() << " = " ;
 	if (dim->is_unlimited())
-	  cout << "UNLIMITED" << " ;\t " << "// " << dim->size() <<
+	  std::cout << "UNLIMITED" << " ;\t " << "// " << dim->size() <<
 	    " currently\n";
 	else
-	  cout << dim->size() << " ;\n";
+	  std::cout << dim->size() << " ;\n";
     }
 }
 
@@ -383,9 +383,9 @@ void dumpatts(NcVar& var)
     NcToken vname = var.name();
     NcAtt* ap;
     for(int n = 0; (ap = var.get_att(n)); n++) {
-	cout << "\t\t" << vname << ":" << ap->name() << " = " ;
+	std::cout << "\t\t" << vname << ":" << ap->name() << " = " ;
 	NcValues* vals = ap->values();
-	cout << *vals << " ;" << endl ;
+	std::cout << *vals << " ;" << endl ;
 	delete ap;
 	delete vals;
     }
@@ -399,19 +399,19 @@ void DumpableNcFile::dumpvars( void )
     NcVar* vp;
 
     for(n = 0; (vp = get_var(n)); n++) {
-	cout << "\t" << types[vp->type()] << " " << vp->name() ;
+	std::cout << "\t" << types[vp->type()] << " " << vp->name() ;
 
 	if (vp->num_dims() > 0) {
-	    cout << "(";
+	    std::cout << "(";
 	    for (int d = 0; d < vp->num_dims(); d++) {
 		NcDim* dim = vp->get_dim(d);
-		cout << dim->name();
+		std::cout << dim->name();
 		if (d < vp->num_dims()-1)
-		  cout << ", ";		  
+		  std::cout << ", ";		  
 	    }
-	    cout << ")";
+	    std::cout << ")";
 	}
-	cout << " ;\n";
+	std::cout << " ;\n";
 	// now dump each of this variable's attributes
 	dumpatts(*vp);
     }
@@ -421,9 +421,9 @@ void DumpableNcFile::dumpgatts( void )
 {
     NcAtt* ap;
     for(int n = 0; (ap = get_att(n)); n++) {
-	cout << "\t\t" << ":" << ap->name() << " = " ;
+	std::cout << "\t\t" << ":" << ap->name() << " = " ;
 	NcValues* vals = ap->values();
-	cout << *vals << " ;" << endl ;
+	std::cout << *vals << " ;" << endl ;
 	delete vals;
 	delete ap;
     }
@@ -433,9 +433,9 @@ void DumpableNcFile::dumpdata( )
 {
     NcVar* vp;
     for (int n = 0; (vp = get_var(n)); n++) {
-	cout << " " << vp->name() << " = ";
+	std::cout << " " << vp->name() << " = ";
 	NcValues* vals = vp->values();
-	cout << *vals << " ;" << endl ;
+	std::cout << *vals << " ;" << endl ;
 	delete vals;
     }
 }
@@ -444,25 +444,25 @@ void dump(const char* path)
 {
     DumpableNcFile nc(path);	// default is open in read-only mode
 
-    cout << "netcdf " << cdl_name(path) << " {" << endl <<
-	    "dimensions:" << endl ;
+    std::cout << "netcdf " << cdl_name(path) << " {" << std::endl <<
+	    "dimensions:" << std::endl ;
 
     nc.dumpdims();
 
-    cout << "variables:" << endl;
+    std::cout << "variables:" << std::endl;
 
     nc.dumpvars();
 
     if (nc.num_atts() > 0)
-      cout << "// global attributes" << endl ;
+      std::cout << "// global attributes" << std::endl ;
 
     nc.dumpgatts();
 
-    cout << "data:" << endl;
+    std::cout << "data:" << std::endl;
 
     nc.dumpdata();
 
-    cout << "}" << endl;
+    std::cout << "}" << std::endl;
 }
 
 /* Test everything for classic and 64-bit offsetfiles. If netcdf-4 is
@@ -477,7 +477,7 @@ int
 main( void )	// test new netCDF interface
 {
 
-   cout << "*** Testing C++ API with " << NUM_FORMATS 
+   std::cout << "*** Testing C++ API with " << NUM_FORMATS 
 	<< " different netCDF formats.\n";
 
    // Set up the format constants.
@@ -501,18 +501,18 @@ main( void )	// test new netCDF interfac
       if (gen(file_name[i], format[i]) || 
 	  read(file_name[i], format[i]))
       {
-	 cout << "*** FAILURE with file " << file_name[i] << "\n";
+	 std::cout << "*** FAILURE with file " << file_name[i] << "\n";
 	 errs++;
       }
       else
-	 cout << "*** SUCCESS with file " << file_name[i] << "\n";
+	 std::cout << "*** SUCCESS with file " << file_name[i] << "\n";
    }
 
-   cout << "\n*** Total number of failures: " << errs << "\n";
+   std::cout << "\n*** Total number of failures: " << errs << "\n";
    if (errs)
-      cout << "*** nctst FAILURE!\n";
+      std::cout << "*** nctst FAILURE!\n";
    else
-      cout << "*** nctst SUCCESS!\n";
+      std::cout << "*** nctst SUCCESS!\n";
       
    return errs;
 }