| @@ -1,121 +1,96 @@ | | | @@ -1,121 +1,96 @@ |
| 1 | $NetBSD: patch-an,v 1.2 2005/02/25 09:52:47 adam Exp $ | | 1 | $NetBSD: patch-an,v 1.3 2012/03/07 16:11:30 adam Exp $ |
| 2 | | | 2 | |
| 3 | --- cxx/nctst.cpp.orig 2004-08-15 18:04:30.000000000 +0000 | | 3 | --- cxx/nctst.cpp.orig 2011-06-30 23:22:19.000000000 +0000 |
| 4 | +++ cxx/nctst.cpp | | 4 | +++ cxx/nctst.cpp |
| 5 | @@ -1,6 +1,6 @@ | | 5 | @@ -369,12 +369,12 @@ void DumpableNcFile::dumpdims( void ) |
| 6 | #include <iostream> | | | |
| 7 | using namespace std; | | | |
| 8 | - | | | |
| 9 | +#include <iostream> | | | |
| 10 | #include <string.h> | | | |
| 11 | #include "netcdfcpp.h" | | | |
| 12 | | | | |
| 13 | @@ -22,7 +22,7 @@ void gen(const char* path, int version) | | | |
| 14 | | | | |
| 15 | // Check if the file was opened successfully | | | |
| 16 | if (! nc.is_valid()) { | | | |
| 17 | - cerr << "can't create netCDF file " << path << "\n"; | | | |
| 18 | + std::cerr << "can't create netCDF file " << path << "\n"; | | | |
| 19 | return; | | | |
| 20 | } | | | |
| 21 | | | | |
| 22 | @@ -138,12 +138,12 @@ void DumpableNcFile::dumpdims( void ) | | | |
| 23 | | | 6 | |
| 24 | for (int n=0; n < num_dims(); n++) { | | 7 | for (int n=0; n < num_dims(); n++) { |
| 25 | NcDim* dim = get_dim(n); | | 8 | NcDim* dim = get_dim(n); |
| 26 | - cout << "\t" << dim->name() << " = " ; | | 9 | - cout << "\t" << dim->name() << " = " ; |
| 27 | + std::cout << "\t" << dim->name() << " = " ; | | 10 | + std::cout << "\t" << dim->name() << " = " ; |
| 28 | if (dim->is_unlimited()) | | 11 | if (dim->is_unlimited()) |
| 29 | - cout << "UNLIMITED" << " ;\t " << "// " << dim->size() << | | 12 | - cout << "UNLIMITED" << " ;\t " << "// " << dim->size() << |
| 30 | + std::cout << "UNLIMITED" << " ;\t " << "// " << dim->size() << | | 13 | + std::cout << "UNLIMITED" << " ;\t " << "// " << dim->size() << |
| 31 | " currently\n"; | | 14 | " currently\n"; |
| 32 | else | | 15 | else |
| 33 | - cout << dim->size() << " ;\n"; | | 16 | - cout << dim->size() << " ;\n"; |
| 34 | + std::cout << dim->size() << " ;\n"; | | 17 | + std::cout << dim->size() << " ;\n"; |
| 35 | } | | 18 | } |
| 36 | } | | 19 | } |
| 37 | | | 20 | |
| 38 | @@ -151,10 +151,10 @@ void dumpatts(NcVar& var) | | 21 | @@ -383,9 +383,9 @@ void dumpatts(NcVar& var) |
| 39 | { | | | |
| 40 | NcToken vname = var.name(); | | 22 | NcToken vname = var.name(); |
| 41 | NcAtt* ap; | | 23 | NcAtt* ap; |
| 42 | - for(int n = 0; ap = var.get_att(n); n++) { | | 24 | for(int n = 0; (ap = var.get_att(n)); n++) { |
| 43 | - cout << "\t\t" << vname << ":" << ap->name() << " = " ; | | 25 | - cout << "\t\t" << vname << ":" << ap->name() << " = " ; |
| 44 | + for(int n = 0; (ap = var.get_att(n)); n++) { | | | |
| 45 | + std::cout << "\t\t" << vname << ":" << ap->name() << " = " ; | | 26 | + std::cout << "\t\t" << vname << ":" << ap->name() << " = " ; |
| 46 | NcValues* vals = ap->values(); | | 27 | NcValues* vals = ap->values(); |
| 47 | - cout << *vals << " ;" << endl ; | | 28 | - cout << *vals << " ;" << endl ; |
| 48 | + std::cout << *vals << " ;" << std::endl ; | | 29 | + std::cout << *vals << " ;" << endl ; |
| 49 | delete ap; | | 30 | delete ap; |
| 50 | delete vals; | | 31 | delete vals; |
| 51 | } | | 32 | } |
| 52 | @@ -167,20 +167,20 @@ void DumpableNcFile::dumpvars( void ) | | 33 | @@ -399,19 +399,19 @@ void DumpableNcFile::dumpvars( void ) |
| 53 | {"","byte","char","short","long","float","double"}; | | | |
| 54 | NcVar* vp; | | 34 | NcVar* vp; |
| 55 | | | 35 | |
| 56 | - for(n = 0; vp = get_var(n); n++) { | | 36 | for(n = 0; (vp = get_var(n)); n++) { |
| 57 | - cout << "\t" << types[vp->type()] << " " << vp->name() ; | | 37 | - cout << "\t" << types[vp->type()] << " " << vp->name() ; |
| 58 | + for(n = 0; (vp = get_var(n)); n++) { | | | |
| 59 | + std::cout << "\t" << types[vp->type()] << " " << vp->name() ; | | 38 | + std::cout << "\t" << types[vp->type()] << " " << vp->name() ; |
| 60 | | | 39 | |
| 61 | if (vp->num_dims() > 0) { | | 40 | if (vp->num_dims() > 0) { |
| 62 | - cout << "("; | | 41 | - cout << "("; |
| 63 | + std::cout << "("; | | 42 | + std::cout << "("; |
| 64 | for (int d = 0; d < vp->num_dims(); d++) { | | 43 | for (int d = 0; d < vp->num_dims(); d++) { |
| 65 | NcDim* dim = vp->get_dim(d); | | 44 | NcDim* dim = vp->get_dim(d); |
| 66 | - cout << dim->name(); | | 45 | - cout << dim->name(); |
| 67 | + std::cout << dim->name(); | | 46 | + std::cout << dim->name(); |
| 68 | if (d < vp->num_dims()-1) | | 47 | if (d < vp->num_dims()-1) |
| 69 | - cout << ", "; | | 48 | - cout << ", "; |
| 70 | + std::cout << ", "; | | 49 | + std::cout << ", "; |
| 71 | } | | 50 | } |
| 72 | - cout << ")"; | | 51 | - cout << ")"; |
| 73 | + std::cout << ")"; | | 52 | + std::cout << ")"; |
| 74 | } | | 53 | } |
| 75 | - cout << " ;\n"; | | 54 | - cout << " ;\n"; |
| 76 | + std::cout << " ;\n"; | | 55 | + std::cout << " ;\n"; |
| 77 | // now dump each of this variable's attributes | | 56 | // now dump each of this variable's attributes |
| 78 | dumpatts(*vp); | | 57 | dumpatts(*vp); |
| 79 | } | | 58 | } |
| 80 | @@ -189,10 +189,10 @@ void DumpableNcFile::dumpvars( void ) | | 59 | @@ -421,9 +421,9 @@ void DumpableNcFile::dumpgatts( void ) |
| 81 | void DumpableNcFile::dumpgatts( void ) | | | |
| 82 | { | | 60 | { |
| 83 | NcAtt* ap; | | 61 | NcAtt* ap; |
| 84 | - for(int n = 0; ap = get_att(n); n++) { | | 62 | for(int n = 0; (ap = get_att(n)); n++) { |
| 85 | - cout << "\t\t" << ":" << ap->name() << " = " ; | | 63 | - cout << "\t\t" << ":" << ap->name() << " = " ; |
| 86 | + for(int n = 0; (ap = get_att(n)); n++) { | | | |
| 87 | + std::cout << "\t\t" << ":" << ap->name() << " = " ; | | 64 | + std::cout << "\t\t" << ":" << ap->name() << " = " ; |
| 88 | NcValues* vals = ap->values(); | | 65 | NcValues* vals = ap->values(); |
| 89 | - cout << *vals << " ;" << endl ; | | 66 | - cout << *vals << " ;" << endl ; |
| 90 | + std::cout << *vals << " ;" << std::endl ; | | 67 | + std::cout << *vals << " ;" << endl ; |
| 91 | delete vals; | | 68 | delete vals; |
| 92 | delete ap; | | 69 | delete ap; |
| 93 | } | | 70 | } |
| 94 | @@ -201,10 +201,10 @@ void DumpableNcFile::dumpgatts( void ) | | 71 | @@ -433,9 +433,9 @@ void DumpableNcFile::dumpdata( ) |
| 95 | void DumpableNcFile::dumpdata( ) | | | |
| 96 | { | | 72 | { |
| 97 | NcVar* vp; | | 73 | NcVar* vp; |
| 98 | - for (int n = 0; vp = get_var(n); n++) { | | 74 | for (int n = 0; (vp = get_var(n)); n++) { |
| 99 | - cout << " " << vp->name() << " = "; | | 75 | - cout << " " << vp->name() << " = "; |
| 100 | + for (int n = 0; (vp = get_var(n)); n++) { | | | |
| 101 | + std::cout << " " << vp->name() << " = "; | | 76 | + std::cout << " " << vp->name() << " = "; |
| 102 | NcValues* vals = vp->values(); | | 77 | NcValues* vals = vp->values(); |
| 103 | - cout << *vals << " ;" << endl ; | | 78 | - cout << *vals << " ;" << endl ; |
| 104 | + std::cout << *vals << " ;" << std::endl ; | | 79 | + std::cout << *vals << " ;" << endl ; |
| 105 | delete vals; | | 80 | delete vals; |
| 106 | } | | 81 | } |
| 107 | } | | 82 | } |
| 108 | @@ -213,25 +213,25 @@ void dump(const char* path) | | 83 | @@ -444,25 +444,25 @@ void dump(const char* path) |
| 109 | { | | 84 | { |
| 110 | DumpableNcFile nc(path); // default is open in read-only mode | | 85 | DumpableNcFile nc(path); // default is open in read-only mode |
| 111 | | | 86 | |
| 112 | - cout << "netcdf " << cdl_name(path) << " {" << endl << | | 87 | - cout << "netcdf " << cdl_name(path) << " {" << endl << |
| 113 | - "dimensions:" << endl ; | | 88 | - "dimensions:" << endl ; |
| 114 | + std::cout << "netcdf " << cdl_name(path) << " {" << std::endl << | | 89 | + std::cout << "netcdf " << cdl_name(path) << " {" << std::endl << |
| 115 | + "dimensions:" << std::endl ; | | 90 | + "dimensions:" << std::endl ; |
| 116 | | | 91 | |
| 117 | nc.dumpdims(); | | 92 | nc.dumpdims(); |
| 118 | | | 93 | |
| 119 | - cout << "variables:" << endl; | | 94 | - cout << "variables:" << endl; |
| 120 | + std::cout << "variables:" << std::endl; | | 95 | + std::cout << "variables:" << std::endl; |
| 121 | | | 96 | |
| @@ -126,14 +101,47 @@ $NetBSD: patch-an,v 1.2 2005/02/25 09:52 | | | @@ -126,14 +101,47 @@ $NetBSD: patch-an,v 1.2 2005/02/25 09:52 |
| 126 | + std::cout << "// global attributes" << std::endl ; | | 101 | + std::cout << "// global attributes" << std::endl ; |
| 127 | | | 102 | |
| 128 | nc.dumpgatts(); | | 103 | nc.dumpgatts(); |
| 129 | | | 104 | |
| 130 | - cout << "data:" << endl; | | 105 | - cout << "data:" << endl; |
| 131 | + std::cout << "data:" << std::endl; | | 106 | + std::cout << "data:" << std::endl; |
| 132 | | | 107 | |
| 133 | nc.dumpdata(); | | 108 | nc.dumpdata(); |
| 134 | | | 109 | |
| 135 | - cout << "}" << endl; | | 110 | - cout << "}" << endl; |
| 136 | + std::cout << "}" << std::endl; | | 111 | + std::cout << "}" << std::endl; |
| 137 | } | | 112 | } |
| 138 | | | 113 | |
| | | 114 | /* Test everything for classic and 64-bit offsetfiles. If netcdf-4 is |
| | | 115 | @@ -477,7 +477,7 @@ int |
| | | 116 | main( void ) // test new netCDF interface |
| | | 117 | { |
| 139 | | | 118 | |
| | | 119 | - cout << "*** Testing C++ API with " << NUM_FORMATS |
| | | 120 | + std::cout << "*** Testing C++ API with " << NUM_FORMATS |
| | | 121 | << " different netCDF formats.\n"; |
| | | 122 | |
| | | 123 | // Set up the format constants. |
| | | 124 | @@ -501,18 +501,18 @@ main( void ) // test new netCDF interfac |
| | | 125 | if (gen(file_name[i], format[i]) || |
| | | 126 | read(file_name[i], format[i])) |
| | | 127 | { |
| | | 128 | - cout << "*** FAILURE with file " << file_name[i] << "\n"; |
| | | 129 | + std::cout << "*** FAILURE with file " << file_name[i] << "\n"; |
| | | 130 | errs++; |
| | | 131 | } |
| | | 132 | else |
| | | 133 | - cout << "*** SUCCESS with file " << file_name[i] << "\n"; |
| | | 134 | + std::cout << "*** SUCCESS with file " << file_name[i] << "\n"; |
| | | 135 | } |
| | | 136 | |
| | | 137 | - cout << "\n*** Total number of failures: " << errs << "\n"; |
| | | 138 | + std::cout << "\n*** Total number of failures: " << errs << "\n"; |
| | | 139 | if (errs) |
| | | 140 | - cout << "*** nctst FAILURE!\n"; |
| | | 141 | + std::cout << "*** nctst FAILURE!\n"; |
| | | 142 | else |
| | | 143 | - cout << "*** nctst SUCCESS!\n"; |
| | | 144 | + std::cout << "*** nctst SUCCESS!\n"; |
| | | 145 | |
| | | 146 | return errs; |
| | | 147 | } |