summaryrefslogtreecommitdiff
path: root/devel/netcdf/patches/patch-an
blob: 37fb4920173363117650f27617ad5b0ccaf53cd2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
$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;
 }