graphics/plotutils/files/patch-include_plotter.h


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
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353

$FreeBSD$

--- include/plotter.h.orig	Wed Jun 28 06:21:36 2000
+++ include/plotter.h	Thu Aug  7 11:48:12 2003
@@ -58,8 +58,8 @@
 /* Include iostream, stdio support if this is libplotter rather than
    libplot. */
 #ifndef NOT_LIBPLOTTER
-#include <iostream.h>
-#include <stdio.h>
+#include <iostream>
+#include <cstdio>
 #endif
 
 /* THE GLOBAL VARIABLES IN GNU LIBPLOTTER */
@@ -680,9 +680,9 @@
   FILE *outfp;			/* stdio-style output stream if any */
   FILE *errfp;			/* stdio-style error stream if any */
 #ifndef NOT_LIBPLOTTER
-  istream *instream;		/* C++-style input stream if any */
-  ostream *outstream;		/* C++-style output stream if any */
-  ostream *errstream;		/* C++-style error stream if any */
+  std::istream *instream;	/* C++-style input stream if any */
+  std::ostream *outstream;	/* C++-style output stream if any */
+  std::ostream *errstream;	/* C++-style error stream if any */
 #endif /* not NOT_LIBPLOTTER */
 
   /* device driver parameters (i.e., instance copies of class variables) */
@@ -898,14 +898,15 @@
   /* PLOTTER CTORS (old-style, not thread-safe) */
   Plotter (FILE *infile, FILE *outfile, FILE *errfile);
   Plotter (FILE *outfile);
-  Plotter (istream& in, ostream& out, ostream& err);
-  Plotter (ostream& out);
+  Plotter (std::istream& in, std::ostream& out, std::ostream& err);
+  Plotter (std::ostream& out);
   Plotter ();
   /* PLOTTER CTORS (new-style, thread-safe) */
   Plotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   Plotter (FILE *outfile, PlotterParams &params);
-  Plotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  Plotter (ostream& out, PlotterParams &params);
+  Plotter (std::istream& in, std::ostream& out, std::ostream& err, 
+	   PlotterParams &params);
+  Plotter (std::ostream& out, PlotterParams &params);
   Plotter (PlotterParams &params);
   /* PLOTTER DTOR */
   virtual ~Plotter ();
@@ -1487,14 +1488,14 @@
   /* ctors (old-style, not thread-safe) */
   MetaPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   MetaPlotter (FILE *outfile);
-  MetaPlotter (istream& in, ostream& out, ostream& err);
-  MetaPlotter (ostream& out);
+  MetaPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  MetaPlotter (std::ostream& out);
   MetaPlotter ();
   /* ctors (new-style, thread-safe) */
   MetaPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   MetaPlotter (FILE *outfile, PlotterParams &params);
-  MetaPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  MetaPlotter (ostream& out, PlotterParams &params);
+  MetaPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  MetaPlotter (std::ostream& out, PlotterParams &params);
   MetaPlotter (PlotterParams &params);
   /* dtor */
   virtual ~MetaPlotter ();
@@ -1566,14 +1567,14 @@
   /* ctors (old-style, not thread-safe) */
   BitmapPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   BitmapPlotter (FILE *outfile);
-  BitmapPlotter (istream& in, ostream& out, ostream& err);
-  BitmapPlotter (ostream& out);
+  BitmapPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  BitmapPlotter (std::ostream& out);
   BitmapPlotter ();
   /* ctors (new-style, thread-safe) */
   BitmapPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   BitmapPlotter (FILE *outfile, PlotterParams &params);
-  BitmapPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  BitmapPlotter (ostream& out, PlotterParams &params);
+  BitmapPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  BitmapPlotter (std::ostream& out, PlotterParams &params);
   BitmapPlotter (PlotterParams &params);
   /* dtor */
   virtual ~BitmapPlotter ();
@@ -1613,14 +1614,14 @@
   /* ctors (old-style, not thread-safe) */
   TekPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   TekPlotter (FILE *outfile);
-  TekPlotter (istream& in, ostream& out, ostream& err);
-  TekPlotter (ostream& out);
+  TekPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  TekPlotter (std::ostream& out);
   TekPlotter ();
   /* ctors (new-style, thread-safe) */
   TekPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   TekPlotter (FILE *outfile, PlotterParams &params);
-  TekPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  TekPlotter (ostream& out, PlotterParams &params);
+  TekPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  TekPlotter (std::ostream& out, PlotterParams &params);
   TekPlotter (PlotterParams &params);
   /* dtor */
   virtual ~TekPlotter ();
@@ -1665,14 +1666,14 @@
   /* ctors (old-style, not thread-safe) */
   ReGISPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   ReGISPlotter (FILE *outfile);
-  ReGISPlotter (istream& in, ostream& out, ostream& err);
-  ReGISPlotter (ostream& out);
+  ReGISPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  ReGISPlotter (std::ostream& out);
   ReGISPlotter ();
   /* ctors (new-style, thread-safe) */
   ReGISPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   ReGISPlotter (FILE *outfile, PlotterParams &params);
-  ReGISPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  ReGISPlotter (ostream& out, PlotterParams &params);
+  ReGISPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  ReGISPlotter (std::ostream& out, PlotterParams &params);
   ReGISPlotter (PlotterParams &params);
   /* dtor */
   virtual ~ReGISPlotter ();
@@ -1716,14 +1717,14 @@
   /* ctors (old-style, not thread-safe) */
   HPGLPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   HPGLPlotter (FILE *outfile);
-  HPGLPlotter (istream& in, ostream& out, ostream& err);
-  HPGLPlotter (ostream& out);
+  HPGLPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  HPGLPlotter (std::ostream& out);
   HPGLPlotter ();
   /* ctors (new-style, thread-safe) */
   HPGLPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   HPGLPlotter (FILE *outfile, PlotterParams &params);
-  HPGLPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  HPGLPlotter (ostream& out, PlotterParams &params);
+  HPGLPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  HPGLPlotter (std::ostream& out, PlotterParams &params);
   HPGLPlotter (PlotterParams &params);
   /* dtor */
   virtual ~HPGLPlotter ();
@@ -1812,14 +1813,14 @@
   /* ctors (old-style, not thread-safe) */
   PCLPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   PCLPlotter (FILE *outfile);
-  PCLPlotter (istream& in, ostream& out, ostream& err);
-  PCLPlotter (ostream& out);
+  PCLPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  PCLPlotter (std::ostream& out);
   PCLPlotter ();
   /* ctors (new-style, thread-safe) */
   PCLPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   PCLPlotter (FILE *outfile, PlotterParams &params);
-  PCLPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  PCLPlotter (ostream& out, PlotterParams &params);
+  PCLPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  PCLPlotter (std::ostream& out, PlotterParams &params);
   PCLPlotter (PlotterParams &params);
   /* dtor */
   virtual ~PCLPlotter ();
@@ -1843,14 +1844,14 @@
   /* ctors (old-style, not thread-safe) */
   FigPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   FigPlotter (FILE *outfile);
-  FigPlotter (istream& in, ostream& out, ostream& err);
-  FigPlotter (ostream& out);
+  FigPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  FigPlotter (std::ostream& out);
   FigPlotter ();
   /* ctors (new-style, thread-safe) */
   FigPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   FigPlotter (FILE *outfile, PlotterParams &params);
-  FigPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  FigPlotter (ostream& out, PlotterParams &params);
+  FigPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  FigPlotter (std::ostream& out, PlotterParams &params);
   FigPlotter (PlotterParams &params);
   /* dtor */
   virtual ~FigPlotter ();
@@ -1893,14 +1894,14 @@
   /* ctors (old-style, not thread-safe) */
   CGMPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   CGMPlotter (FILE *outfile);
-  CGMPlotter (istream& in, ostream& out, ostream& err);
-  CGMPlotter (ostream& out);
+  CGMPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  CGMPlotter (std::ostream& out);
   CGMPlotter ();
   /* ctors (new-style, thread-safe) */
   CGMPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   CGMPlotter (FILE *outfile, PlotterParams &params);
-  CGMPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  CGMPlotter (ostream& out, PlotterParams &params);
+  CGMPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  CGMPlotter (std::ostream& out, PlotterParams &params);
   CGMPlotter (PlotterParams &params);
   /* dtor */
   virtual ~CGMPlotter ();
@@ -1978,14 +1979,14 @@
   /* ctors (old-style, not thread-safe) */
   PSPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   PSPlotter (FILE *outfile);
-  PSPlotter (istream& in, ostream& out, ostream& err);
-  PSPlotter (ostream& out);
+  PSPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  PSPlotter (std::ostream& out);
   PSPlotter ();
   /* ctors (new-style, thread-safe) */
   PSPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   PSPlotter (FILE *outfile, PlotterParams &params);
-  PSPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  PSPlotter (ostream& out, PlotterParams &params);
+  PSPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  PSPlotter (std::ostream& out, PlotterParams &params);
   PSPlotter (PlotterParams &params);
   /* dtor */
   virtual ~PSPlotter ();
@@ -2019,14 +2020,14 @@
   /* ctors (old-style, not thread-safe) */
   AIPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   AIPlotter (FILE *outfile);
-  AIPlotter (istream& in, ostream& out, ostream& err);
-  AIPlotter (ostream& out);
+  AIPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  AIPlotter (std::ostream& out);
   AIPlotter ();
   /* ctors (new-style, thread-safe) */
   AIPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   AIPlotter (FILE *outfile, PlotterParams &params);
-  AIPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  AIPlotter (ostream& out, PlotterParams &params);
+  AIPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  AIPlotter (std::ostream& out, PlotterParams &params);
   AIPlotter (PlotterParams &params);
   /* dtor */
   virtual ~AIPlotter ();
@@ -2078,14 +2079,14 @@
   /* ctors (old-style, not thread-safe) */
   SVGPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   SVGPlotter (FILE *outfile);
-  SVGPlotter (istream& in, ostream& out, ostream& err);
-  SVGPlotter (ostream& out);
+  SVGPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  SVGPlotter (std::ostream& out);
   SVGPlotter ();
   /* ctors (new-style, thread-safe) */
   SVGPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   SVGPlotter (FILE *outfile, PlotterParams &params);
-  SVGPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  SVGPlotter (ostream& out, PlotterParams &params);
+  SVGPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  SVGPlotter (std::ostream& out, PlotterParams &params);
   SVGPlotter (PlotterParams &params);
   /* dtor */
   virtual ~SVGPlotter ();
@@ -2122,14 +2123,14 @@
   /* ctors (old-style, not thread-safe) */
   PNMPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   PNMPlotter (FILE *outfile);
-  PNMPlotter (istream& in, ostream& out, ostream& err);
-  PNMPlotter (ostream& out);
+  PNMPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  PNMPlotter (std::ostream& out);
   PNMPlotter ();
   /* ctors (new-style, thread-safe) */
   PNMPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   PNMPlotter (FILE *outfile, PlotterParams &params);
-  PNMPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  PNMPlotter (ostream& out, PlotterParams &params);
+  PNMPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  PNMPlotter (std::ostream& out, PlotterParams &params);
   PNMPlotter (PlotterParams &params);
   /* dtor */
   virtual ~PNMPlotter ();
@@ -2161,14 +2162,14 @@
   /* ctors (old-style, not thread-safe) */
   PNGPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   PNGPlotter (FILE *outfile);
-  PNGPlotter (istream& in, ostream& out, ostream& err);
-  PNGPlotter (ostream& out);
+  PNGPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  PNGPlotter (std::ostream& out);
   PNGPlotter ();
   /* ctors (new-style, thread-safe) */
   PNGPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   PNGPlotter (FILE *outfile, PlotterParams &params);
-  PNGPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  PNGPlotter (ostream& out, PlotterParams &params);
+  PNGPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  PNGPlotter (std::ostream& out, PlotterParams &params);
   PNGPlotter (PlotterParams &params);
   /* dtor */
   virtual ~PNGPlotter ();
@@ -2196,14 +2197,14 @@
   /* ctors (old-style, not thread-safe) */
   GIFPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   GIFPlotter (FILE *outfile);
-  GIFPlotter (istream& in, ostream& out, ostream& err);
-  GIFPlotter (ostream& out);
+  GIFPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  GIFPlotter (std::ostream& out);
   GIFPlotter ();
   /* ctors (new-style, thread-safe) */
   GIFPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   GIFPlotter (FILE *outfile, PlotterParams &params);
-  GIFPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  GIFPlotter (ostream& out, PlotterParams &params);
+  GIFPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  GIFPlotter (std::ostream& out, PlotterParams &params);
   GIFPlotter (PlotterParams &params);
   /* dtor */
   virtual ~GIFPlotter ();
@@ -2270,14 +2271,14 @@
   /* ctors (old-style, not thread-safe) */
   XDrawablePlotter (FILE *infile, FILE *outfile, FILE *errfile);
   XDrawablePlotter (FILE *outfile);
-  XDrawablePlotter (istream& in, ostream& out, ostream& err);
-  XDrawablePlotter (ostream& out);
+  XDrawablePlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  XDrawablePlotter (std::ostream& out);
   XDrawablePlotter ();
   /* ctors (new-style, thread-safe) */
   XDrawablePlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   XDrawablePlotter (FILE *outfile, PlotterParams &params);
-  XDrawablePlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  XDrawablePlotter (ostream& out, PlotterParams &params);
+  XDrawablePlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  XDrawablePlotter (std::ostream& out, PlotterParams &params);
   XDrawablePlotter (PlotterParams &params);
   /* dtor */
   virtual ~XDrawablePlotter ();
@@ -2345,14 +2346,14 @@
   /* ctors (old-style, not thread-safe) */
   XPlotter (FILE *infile, FILE *outfile, FILE *errfile);
   XPlotter (FILE *outfile);
-  XPlotter (istream& in, ostream& out, ostream& err);
-  XPlotter (ostream& out);
+  XPlotter (std::istream& in, std::ostream& out, std::ostream& err);
+  XPlotter (std::ostream& out);
   XPlotter ();
   /* ctors (new-style, thread-safe) */
   XPlotter (FILE *infile, FILE *outfile, FILE *errfile, PlotterParams &params);
   XPlotter (FILE *outfile, PlotterParams &params);
-  XPlotter (istream& in, ostream& out, ostream& err, PlotterParams &params);
-  XPlotter (ostream& out, PlotterParams &params);
+  XPlotter (std::istream& in, std::ostream& out, std::ostream& err, PlotterParams &params);
+  XPlotter (std::ostream& out, PlotterParams &params);
   XPlotter (PlotterParams &params);
   /* dtor */
   virtual ~XPlotter ();