]> git.pld-linux.org Git - packages/arts++.git/blame - arts++-gcc3.patch
projects / packages / arts++.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- just printf, /usr/bin/printf is no more
[packages/arts++.git] / arts++-gcc3.patch
CommitLineData
eaa202b3
JB		 1--- arts++-1-1-a9/apps/artsagg/artsagg.cc.orig Sat Nov 16 01:46:38 2002
2+++ arts++-1-1-a9/apps/artsagg/artsagg.cc Fri Feb 13 16:15:31 2004
3@@ -64,7 +64,7 @@
4 #include "ArtsPackageVersion.hh"
5 #include "ArtsDebug.hh"
6
7-extern int errno;
8+using namespace std;
9
10 const string rcsid = "@(#) $Name$ $Id$";
11 static const ArtsPackageVersion k_artsVersion = ArtsPackageVersion(rcsid);
12--- arts++-1-1-a9/apps/artsases/artsases.cc.orig Sat Nov 16 01:46:38 2002
13+++ arts++-1-1-a9/apps/artsases/artsases.cc Fri Feb 13 16:16:16 2004
14@@ -71,6 +71,7 @@
15 #include "ArtsDebug.hh"
16 #endif
17
18+using namespace std;
19
20 extern char *tzname[2];
21
22--- arts++-1-1-a9/apps/artsdump/artsdump.cc.orig Sat Nov 16 01:46:38 2002
23+++ arts++-1-1-a9/apps/artsdump/artsdump.cc Fri Feb 13 16:16:45 2004
24@@ -58,6 +58,8 @@
25 #include "ArtsDebug.hh"
26 #endif
27
28+using namespace std;
29+
30 static const string rcsid = "@(#) $Name$ $Id$";
31 static const ArtsPackageVersion k_artsVersion = ArtsPackageVersion(rcsid);
32
33--- arts++-1-1-a9/apps/artsintfms/artsintfms.cc.orig Sat Nov 16 01:46:38 2002
34+++ arts++-1-1-a9/apps/artsintfms/artsintfms.cc Fri Feb 13 16:18:19 2004
35@@ -63,6 +63,9 @@
36 #include "ArtsDebug.hh"
37 #endif
38
39+#include <iterator>
40+using namespace std;
41+
42 extern char *tzname[2];
43
44 const string rcsid = "@(#) $Name$ $Id$";
45--- arts++-1-1-a9/apps/artsnets/artsnets.cc.orig Sat Nov 16 01:46:38 2002
46+++ arts++-1-1-a9/apps/artsnets/artsnets.cc Fri Feb 13 16:25:36 2004
47@@ -67,6 +67,9 @@
48 #define INADDR_NONE 0xffffffff
49 #endif
50
51+#include <iterator>
52+using namespace std;
53+
54 extern char *tzname[2];
55
56 static const string rcsid = "@(#) $Name$ $Id$";
57@@ -160,7 +163,7 @@
58 }
59 }
60
61- if (hostAttribute) {
62+ if (hostAttribute.base()) {
63 inAddr.s_addr = hostAttribute->Host();
64 cout << "router: " << inet_ntoa(inAddr) << endl;
65 }
66--- arts++-1-1-a9/apps/artsnexthops/artsnexthops.cc.orig Sat Nov 16 01:46:39 2002
67+++ arts++-1-1-a9/apps/artsnexthops/artsnexthops.cc Fri Feb 13 16:26:40 2004
68@@ -63,6 +63,9 @@
69 #include "ArtsDebug.hh"
70 #endif
71
72+#include <iterator>
73+using namespace std;
74+
75 extern char *tzname[2];
76
77 static const string rcsid = "@(#) $Name$ $Id$";
78@@ -116,7 +119,7 @@
79 }
80 }
81
82- if (hostAttribute) {
83+ if (hostAttribute.base()) {
84 inAddr.s_addr = hostAttribute->Host();
85 cout << "router: " << inet_ntoa(inAddr) << endl;
86 }
87@@ -135,7 +138,7 @@
88 cout << endl;
89
90 periodAttribute = arts.FindPeriodAttribute();
91- if (periodAttribute) {
92+ if (periodAttribute.base()) {
93 periodTimes[0] = periodAttribute->Period()[0];
94 periodTimes[1] = periodAttribute->Period()[1];
95 localTm = localtime(&(periodTimes[0]));
96--- arts++-1-1-a9/apps/artsportms/artsportms.cc.orig Sat Nov 16 01:46:39 2002
97+++ arts++-1-1-a9/apps/artsportms/artsportms.cc Fri Feb 13 16:27:29 2004
98@@ -63,6 +63,9 @@
99 #include "ArtsDebug.hh"
100 #endif
101
102+#include <iterator>
103+using namespace std;
104+
105 extern char *tzname[2];
106
107 const string rcsid = "@(#) $Name$ $Id$";
108--- arts++-1-1-a9/apps/artsports/artsports.cc.orig Sat Nov 16 01:46:39 2002
109+++ arts++-1-1-a9/apps/artsports/artsports.cc Fri Feb 13 16:14:51 2004
110@@ -64,6 +64,8 @@
111 #include "ArtsDebug.hh"
112 #endif
113
114+using namespace std;
115+
116 extern char *tzname[2];
117
118 static const string rcsid = "@(#) $Name$ $Id$";
119--- arts++-1-1-a9/apps/artsprotos/artsprotos.cc.orig Sat Nov 16 01:46:39 2002
120+++ arts++-1-1-a9/apps/artsprotos/artsprotos.cc Fri Feb 13 16:28:36 2004
121@@ -64,6 +64,9 @@
122 #include "ArtsDebug.hh"
123 #endif
124
125+#include <iterator>
126+using namespace std;
127+
128 extern char *tzname[2];
129
130 static const string rcsid = "@(#) $Name$ $Id$";
131@@ -118,7 +121,7 @@
132 }
133 }
134
135- if (hostAttribute) {
136+ if (hostAttribute.base()) {
137 inAddr.s_addr = hostAttribute->Host();
138 cout << "router: " << inet_ntoa(inAddr) << endl;
139 }
140--- arts++-1-1-a9/apps/artstoc/artstoc.cc.orig Sat Nov 16 01:46:39 2002
141+++ arts++-1-1-a9/apps/artstoc/artstoc.cc Fri Feb 13 16:29:24 2004
142@@ -59,6 +59,8 @@
143 #include "ArtsDebug.hh"
144 #endif
145
146+using namespace std;
147+
148 extern char *tzname[2];
149
150 static const string rcsid = "@(#) $Name$ $Id$";
151--- arts++-1-1-a9/apps/artstos/artstos.cc.orig Sat Nov 16 01:46:39 2002
152+++ arts++-1-1-a9/apps/artstos/artstos.cc Fri Feb 13 16:30:17 2004
153@@ -64,6 +64,9 @@
154 #include "ArtsDebug.hh"
155 #endif
156
157+#include <iterator>
158+using namespace std;
159+
160 extern char *tzname[2];
161
162 static const string rcsid = "@(#) $Name$ $Id$";
163@@ -108,7 +111,7 @@
164 }
165 }
166
167- if (hostAttribute) {
168+ if (hostAttribute.base()) {
169 inAddr.s_addr = hostAttribute->Host();
170 cout << "router: " << inet_ntoa(inAddr) << endl;
171 }
172@@ -126,7 +129,7 @@
173 }
174 cout << endl;
175
176- if (periodAttribute) {
177+ if (periodAttribute.base()) {
178 periodTimes[0] = periodAttribute->Period()[0];
179 periodTimes[1] = periodAttribute->Period()[1];
180 localTm = localtime(&(periodTimes[0]));
181--- arts++-1-1-a9/classes/include/ArtsNetMatrixData.hh.orig Sat Nov 16 01:46:41 2002
182+++ arts++-1-1-a9/classes/include/ArtsNetMatrixData.hh Fri Feb 13 15:13:23 2004
183@@ -53,6 +53,8 @@
184
185 #include "ArtsNetMatrixEntry.hh"
186
187+using std::vector;
188+
189 //---------------------------------------------------------------------------
190 // class ArtsNetMatrixData
191 //---------------------------------------------------------------------------
192--- arts++-1-1-a9/classes/include/ArtsPackageVersion.hh.orig Sat Nov 16 01:46:41 2002
193+++ arts++-1-1-a9/classes/include/ArtsPackageVersion.hh Fri Feb 13 15:32:18 2004
194@@ -45,6 +45,8 @@
195
196 #include <string>
197
198+using std::string;
199+
200 //---------------------------------------------------------------------------
201 // class ArtsPackageVersion
202 //---------------------------------------------------------------------------
203--- arts++-1-1-a9/classes/include/ArtsPortChooser.hh.orig Sat Nov 16 01:46:41 2002
204+++ arts++-1-1-a9/classes/include/ArtsPortChooser.hh Fri Feb 13 15:34:37 2004
205@@ -51,6 +51,8 @@
206
207 #include "ArtsPortChoice.hh"
208
209+using std::vector;
210+
211 //---------------------------------------------------------------------------
212 // class ArtsPortChooser
213 //---------------------------------------------------------------------------
214--- arts++-1-1-a9/classes/include/Ipv4Network.hh.orig Sat Nov 16 01:46:41 2002
215+++ arts++-1-1-a9/classes/include/Ipv4Network.hh Fri Feb 13 14:56:39 2004
216@@ -180,7 +180,7 @@
217 //--------------------------------------------------------------------------
218 istream & read(istream & is)
219 {
220- is.read(&this->maskLen,sizeof(this->maskLen));
221+ is.read((char*)&this->maskLen,sizeof(this->maskLen));
222 uint8_t octet1 = 0;
223 uint8_t octet2 = 0;
224 uint8_t octet3 = 0;
225@@ -188,25 +188,25 @@
226
227 switch (netSize) {
228 case 1:
229- is.read(&octet1,sizeof(octet1));
230+ is.read((char*)&octet1,sizeof(octet1));
231 this->net = htonl((ipv4addr_t)octet1 << 24);
232 break;
233 case 2:
234- is.read(&octet1,sizeof(octet1));
235- is.read(&octet2,sizeof(octet2));
236+ is.read((char*)&octet1,sizeof(octet1));
237+ is.read((char*)&octet2,sizeof(octet2));
238 this->net =
239 htonl(((ipv4addr_t)octet1 << 24) | ((ipv4addr_t)octet2 << 16));
240 break;
241 case 3:
242- is.read(&octet1,sizeof(octet1));
243- is.read(&octet2,sizeof(octet2));
244- is.read(&octet3,sizeof(octet3));
245+ is.read((char*)&octet1,sizeof(octet1));
246+ is.read((char*)&octet2,sizeof(octet2));
247+ is.read((char*)&octet3,sizeof(octet3));
248 this->net = htonl(((ipv4addr_t)octet1 << 24) |
249 ((ipv4addr_t)octet2 << 16) |
250 ((ipv4addr_t)octet3 << 8));
251 break;
252 case 4:
253- is.read(&this->net,sizeof(this->net));
254+ is.read((char*)&this->net,sizeof(this->net));
255 break;
256 default:
257 break;
258@@ -293,7 +293,7 @@
259 ostream & write(ostream & os) const
260 {
261 // first we write the netmask length
262- os.write(&this->maskLen,sizeof(this->maskLen));
263+ os.write((char*)&this->maskLen,sizeof(this->maskLen));
264
265 uint8_t octet1 = 0;
266 uint8_t octet2 = 0;
267@@ -305,26 +305,26 @@
268 switch (netSize) {
269 case 1:
270 octet1 = ntohl(this->net) >> 24;
271- os.write(&octet1,sizeof(octet1));
272+ os.write((char*)&octet1,sizeof(octet1));
273 break;
274 case 2:
275 netaddr = ntohl(this->net);
276 octet1 = (ipv4addr_t)(netaddr >> 24) & 0xff;
277 octet2 = (ipv4addr_t)(netaddr >> 16) & 0xff;
278- os.write(&octet1,sizeof(octet1));
279- os.write(&octet2,sizeof(octet2));
280+ os.write((char*)&octet1,sizeof(octet1));
281+ os.write((char*)&octet2,sizeof(octet2));
282 break;
283 case 3:
284 netaddr = ntohl(this->net);
285 octet1 = (ipv4addr_t)(netaddr >> 24) & 0xff;
286 octet2 = (ipv4addr_t)(netaddr >> 16) & 0xff;
287 octet3 = (ipv4addr_t)(netaddr >> 8) & 0xff;
288- os.write(&octet1,sizeof(octet1));
289- os.write(&octet2,sizeof(octet2));
290- os.write(&octet3,sizeof(octet3));
291+ os.write((char*)&octet1,sizeof(octet1));
292+ os.write((char*)&octet2,sizeof(octet2));
293+ os.write((char*)&octet3,sizeof(octet3));
294 break;
295 case 4:
296- os.write(&this->net,sizeof(this->net));
297+ os.write((char*)&this->net,sizeof(this->net));
298 break;
299 default:
300 break;
301--- arts++-1-1-a9/classes/include/ArtsAsMatrixData.hh.orig Sat Nov 16 01:46:40 2002
302+++ arts++-1-1-a9/classes/include/ArtsAsMatrixData.hh Fri Feb 13 14:56:39 2004
303@@ -49,9 +49,12 @@
304 }
305
306 #include <vector>
307+using std::vector;
308
309 #ifdef HAVE_IOSTREAM
310 #include <iostream>
311+ using std::istream;
312+ using std::ostream;
313 #else
314 #include <iostream.h>
315 #endif
316--- arts++-1-1-a9/classes/include/ArtsAttribute.hh.orig Sat Nov 16 01:46:40 2002
317+++ arts++-1-1-a9/classes/include/ArtsAttribute.hh Fri Feb 13 14:56:39 2004
318@@ -53,6 +53,8 @@
319 #include <string>
320 #include <istream.h>
321
322+using std::string;
323+
324 //---------------------------------------------------------------------------
325 // Object Attribute Identifiers
326 //---------------------------------------------------------------------------
327--- arts++-1-1-a9/classes/include/ArtsIpPathEntry.hh.orig Thu May 29 07:42:57 2003
328+++ arts++-1-1-a9/classes/include/ArtsIpPathEntry.hh Fri Feb 13 14:56:39 2004
329@@ -54,6 +54,8 @@
330
331 #ifdef HAVE_IOSTREAM
332 #include <iostream>
333+ using std::istream;
334+ using std::ostream;
335 #else
336 #include <iostream.h>
337 #endif
338--- arts++-1-1-a9/classes/include/ArtsAttributeVector.hh.orig Sat Nov 16 01:46:40 2002
339+++ arts++-1-1-a9/classes/include/ArtsAttributeVector.hh Fri Feb 13 14:56:39 2004
340@@ -47,6 +47,8 @@
341
342 #include "ArtsAttribute.hh"
343
344+using std::vector;
345+
346 //----------------------------------------------------------------------------
347 // class ArtsAttributeVector : public vector<ArtsAttribute>
348 //----------------------------------------------------------------------------
349--- arts++-1-1-a9/classes/include/ArtsPortChoice.hh.orig Sat Nov 16 01:46:41 2002
350+++ arts++-1-1-a9/classes/include/ArtsPortChoice.hh Fri Feb 13 14:56:39 2004
351@@ -49,6 +49,8 @@
352
353 #include <map>
354
355+using std::pair;
356+
357 //---------------------------------------------------------------------------
358 // class ArtsPortChoice
359 //---------------------------------------------------------------------------
360--- arts++-1-1-a9/classes/include/ArtsSelection.hh.orig Sat Nov 16 01:46:41 2002
361+++ arts++-1-1-a9/classes/include/ArtsSelection.hh Fri Feb 13 14:56:39 2004
362@@ -45,6 +45,8 @@
363
364 #include <map>
365
366+using std::pair;
367+
368 //----------------------------------------------------------------------------
369 // template <class Type>
370 // class ArtsSelection : pair<Type,Type>
371--- arts++-1-1-a9/classes/include/ArtsAsMatrixAggregator.hh.orig Sat Nov 16 01:46:40 2002
372+++ arts++-1-1-a9/classes/include/ArtsAsMatrixAggregator.hh Fri Feb 13 14:56:39 2004
373@@ -48,6 +48,10 @@
374
375 #include "ArtsAsMatrix.hh"
376
377+using std::map;
378+using std::vector;
379+using std::less;
380+
381 //----------------------------------------------------------------------------
382 // class ArtsAsMatrixKeyValue
383 //----------------------------------------------------------------------------
384--- arts++-1-1-a9/classes/include/ArtsBgp4AsPathSegment.hh.orig Sat Nov 16 01:46:40 2002
385+++ arts++-1-1-a9/classes/include/ArtsBgp4AsPathSegment.hh Fri Feb 13 14:56:39 2004
386@@ -48,6 +48,7 @@
387 }
388
389 #include <vector>
390+using std::vector;
391
392 //---------------------------------------------------------------------------
393 // class ArtsBgp4AsPathSegment
394--- arts++-1-1-a9/classes/include/ArtsProtocolTableAggregator.hh.orig Sat Nov 16 01:46:41 2002
395+++ arts++-1-1-a9/classes/include/ArtsProtocolTableAggregator.hh Fri Feb 13 14:56:39 2004
396@@ -48,6 +48,9 @@
397
398 #include "ArtsProtocolTable.hh"
399
400+using std::map;
401+using std::less;
402+
403 //---------------------------------------------------------------------------
404 // class ArtsProtocolTableAggregator
405 //---------------------------------------------------------------------------
406--- arts++-1-1-a9/classes/include/Ipv4PrefixPatricia.hh.in.orig Sat Jan 4 01:57:31 2003
407+++ arts++-1-1-a9/classes/include/Ipv4PrefixPatricia.hh.in Fri Feb 13 15:02:51 2004
408@@ -23,6 +23,9 @@
409
410 #include "Ipv4Network.hh"
411
412+#include <cassert>
413+using std::pair;
414+
415 #undef WORDS_BIGENDIAN
416
417 //----------------------------------------------------------------------------
418--- arts++-1-1-a9/classes/include/ArtsPortMatrixEntry.hh.orig Sat Nov 16 01:46:41 2002
419+++ arts++-1-1-a9/classes/include/ArtsPortMatrixEntry.hh Fri Feb 13 15:38:20 2004
420@@ -51,6 +51,8 @@
421
422 #ifdef HAVE_IOSTREAM
423 #include <iostream>
424+ using std::istream;
425+ using std::ostream;
426 #else
427 #include <iostream.h>
428 #endif
429--- arts++-1-1-a9/classes/include/ArtsCflowdCustomData.hh.orig Sat Nov 16 01:46:40 2002
430+++ arts++-1-1-a9/classes/include/ArtsCflowdCustomData.hh Fri Feb 13 14:56:39 2004
431@@ -20,6 +20,8 @@
432 }
433
434 #include <map>
435+using std::map;
436+using std::less;
437
438 //----------------------------------------------------------------------------
439 // class ArtsCflowdCustomDataKey
440--- arts++-1-1-a9/classes/include/ArtsSelectionSet.hh.orig Sat Nov 16 01:46:41 2002
441+++ arts++-1-1-a9/classes/include/ArtsSelectionSet.hh Fri Feb 13 14:56:39 2004
442@@ -52,6 +52,8 @@
443
444 #include "ArtsSelection.hh"
445
446+using std::vector;
447+
448 //---------------------------------------------------------------------------
449 // template <class Type> class ArtsSelectionSet
450 //---------------------------------------------------------------------------
451--- arts++-1-1-a9/classes/include/ArtsInterfaceMatrixData.hh.orig Sat Nov 16 01:46:40 2002
452+++ arts++-1-1-a9/classes/include/ArtsInterfaceMatrixData.hh Fri Feb 13 15:05:18 2004
453@@ -58,6 +58,8 @@
454
455 #include "ArtsInterfaceMatrixEntry.hh"
456
457+using std::vector;
458+
459 //---------------------------------------------------------------------------
460 // class ArtsInterfaceMatrixData
461 //---------------------------------------------------------------------------
462--- arts++-1-1-a9/classes/include/ArtsInterfaceMatrixAggregator.hh.orig Sat Nov 16 01:46:40 2002
463+++ arts++-1-1-a9/classes/include/ArtsInterfaceMatrixAggregator.hh Fri Feb 13 15:08:27 2004
464@@ -48,6 +48,10 @@
465
466 #include "ArtsInterfaceMatrix.hh"
467
468+using std::map;
469+using std::vector;
470+using std::less;
471+
472 //----------------------------------------------------------------------------
473 // class ArtsInterfaceMatrixKeyValue
474 //----------------------------------------------------------------------------
475--- arts++-1-1-a9/classes/include/ArtsNetMatrixEntry.hh.orig Sat Nov 16 01:46:41 2002
476+++ arts++-1-1-a9/classes/include/ArtsNetMatrixEntry.hh Fri Feb 13 15:10:59 2004
477@@ -52,6 +52,8 @@
478
479 #ifdef HAVE_IOSTREAM
480 #include <iostream>
481+ using std::istream;
482+ using std::ostream;
483 #else
484 #include <iostream.h>
485 #endif
486--- arts++-1-1-a9/classes/include/ArtsNetMatrixAggregator.hh.orig Sat Nov 16 01:46:40 2002
487+++ arts++-1-1-a9/classes/include/ArtsNetMatrixAggregator.hh Fri Feb 13 15:23:41 2004
488@@ -48,6 +48,10 @@
489
490 #include "ArtsNetMatrix.hh"
491
492+using std::map;
493+using std::vector;
494+using std::less;
495+
496 //----------------------------------------------------------------------------
497 // class ArtsNetMatrixKeyValue
498 //----------------------------------------------------------------------------
499--- arts++-1-1-a9/classes/include/ArtsNextHopTableAggregator.hh.orig Sat Nov 16 01:46:41 2002
500+++ arts++-1-1-a9/classes/include/ArtsNextHopTableAggregator.hh Fri Feb 13 15:29:41 2004
501@@ -48,6 +48,10 @@
502
503 #include "ArtsNextHopTable.hh"
504
505+using std::map;
506+using std::vector;
507+using std::less;
508+
509 //---------------------------------------------------------------------------
510 // class ArtsNextHopTableAggregator
511 //---------------------------------------------------------------------------
512--- arts++-1-1-a9/classes/include/ArtsPortMatrixAggregator.hh.orig Sat Nov 16 01:46:41 2002
513+++ arts++-1-1-a9/classes/include/ArtsPortMatrixAggregator.hh Fri Feb 13 15:35:45 2004
514@@ -49,6 +49,10 @@
515 #include "ArtsPortMatrix.hh"
516 #include "ArtsSelectedPortTable.hh"
517
518+using std::map;
519+using std::vector;
520+using std::less;
521+
522 //----------------------------------------------------------------------------
523 // class ArtsPortMatrixKeyValue
524 //----------------------------------------------------------------------------
525--- arts++-1-1-a9/classes/include/ArtsPortMatrixData.hh.orig Sat Nov 16 01:46:41 2002
526+++ arts++-1-1-a9/classes/include/ArtsPortMatrixData.hh Fri Feb 13 15:40:34 2004
527@@ -59,6 +59,10 @@
528
529 #include "ArtsPortMatrixEntry.hh"
530
531+using std::vector;
532+using std::istream;
533+using std::ostream;
534+
535 //---------------------------------------------------------------------------
536 // class ArtsPortMatrixData
537 //---------------------------------------------------------------------------
538--- arts++-1-1-a9/classes/include/ArtsPortTableAggregator.hh.orig Sat Nov 16 01:46:41 2002
539+++ arts++-1-1-a9/classes/include/ArtsPortTableAggregator.hh Fri Feb 13 15:46:06 2004
540@@ -48,6 +48,10 @@
541
542 #include "ArtsPortTable.hh"
543
544+using std::map;
545+using std::vector;
546+using std::less;
547+
548 //---------------------------------------------------------------------------
549 // class ArtsPortTableAggregator
550 //---------------------------------------------------------------------------
551--- arts++-1-1-a9/classes/include/ArtsRttTimeSeriesTableData.hh.orig Sat Nov 16 01:46:41 2002
552+++ arts++-1-1-a9/classes/include/ArtsRttTimeSeriesTableData.hh Fri Feb 13 16:00:10 2004
553@@ -51,6 +51,11 @@
554
555 #include <vector>
556
557+#include <iostream>
558+using std::istream;
559+using std::ostream;
560+using std::vector;
561+
562 //----------------------------------------------------------------------------
563 // class ArtsRttTimeSeriesTableEntry
564 //----------------------------------------------------------------------------
565--- arts++-1-1-a9/classes/include/ArtsTosTableAggregator.hh.orig Sat Nov 16 01:46:41 2002
566+++ arts++-1-1-a9/classes/include/ArtsTosTableAggregator.hh Fri Feb 13 16:13:02 2004
567@@ -48,6 +48,10 @@
568
569 #include "ArtsTosTable.hh"
570
571+using std::map;
572+using std::vector;
573+using std::less;
574+
575 //---------------------------------------------------------------------------
576 // class ArtsTosTableAggregator
577 //---------------------------------------------------------------------------
578--- arts++-1-1-a9/classes/src/ArtsBgp4Attribute.cc.orig Sat Nov 16 01:46:41 2002
579+++ arts++-1-1-a9/classes/src/ArtsBgp4Attribute.cc Fri Feb 13 14:56:39 2004
580@@ -54,6 +54,8 @@
581 #include "ArtsPrimitive.hh"
582 #include "ArtsBgp4Attribute.hh"
583
584+using namespace std;
585+
586 static const string rcsid = "@(#) $Name$ $Id$";
587
588 //-------------------------------------------------------------------------
589@@ -444,26 +446,26 @@
590 //............................................................................
591 //
592 //----------------------------------------------------------------------------
593-istream & ArtsBgp4Attribute::read(istream & is, uint8_t version = 0)
594+istream & ArtsBgp4Attribute::read(istream & is, uint8_t version /* = 0 */)
595 {
596 uint8_t numCommunities;
597 uint32_t community;
598
599 this->DeleteValue();
600
601- is.read(&this->_flags,sizeof(this->_flags));
602- is.read(&this->_type,sizeof(this->_type));
603+ is.read((char*)&this->_flags,sizeof(this->_flags));
604+ is.read((char*)&this->_type,sizeof(this->_type));
605
606 switch (this->_type) {
607 case Bgp4_Attribute_Origin:
608- is.read(&this->_value._origin,sizeof(this->_value._origin));
609+ is.read((char*)&this->_value._origin,sizeof(this->_value._origin));
610 break;
611 case Bgp4_Attribute_AsPath:
612 this->_value._asPath = new ArtsBgp4AsPathAttribute;
613 this->_value._asPath->read(is,version);
614 break;
615 case Bgp4_Attribute_NextHop:
616- is.read(&this->_value._nextHop,sizeof(this->_value._nextHop));
617+ is.read((char*)&this->_value._nextHop,sizeof(this->_value._nextHop));
618 break;
619 case Bgp4_Attribute_MultiExitDisc:
620 g_ArtsLibInternal_Primitive.ReadUint32(is,this->_value._MED,
621@@ -480,7 +482,7 @@
622 this->_value._aggregator->read(is,version);
623 break;
624 case Bgp4_Attribute_Community:
625- is.read(&numCommunities,sizeof(numCommunities));
626+ is.read((char*)&numCommunities,sizeof(numCommunities));
627 this->_value._community = new vector<uint32_t>;
628 this->_value._community->reserve((int)numCommunities);
629 for (int commNum = 0; commNum < numCommunities; commNum++) {
630@@ -507,7 +509,7 @@
631 //............................................................................
632 //
633 //----------------------------------------------------------------------------
634-int ArtsBgp4Attribute::read(int fd, uint8_t version = 0)
635+int ArtsBgp4Attribute::read(int fd, uint8_t version /* = 0 */)
636 {
637 uint8_t numCommunities;
638 uint32_t community;
639@@ -622,22 +624,22 @@
640 //
641 //----------------------------------------------------------------------------
642 ostream & ArtsBgp4Attribute::write(ostream & os,
643- uint8_t version = 0) const
644+ uint8_t version /* = 0 */) const
645 {
646 uint8_t numCommunities;
647
648- os.write(&this->_flags,sizeof(this->_flags));
649- os.write(&this->_type,sizeof(this->_type));
650+ os.write((char*)&this->_flags,sizeof(this->_flags));
651+ os.write((char*)&this->_type,sizeof(this->_type));
652
653 switch (this->_type) {
654 case Bgp4_Attribute_Origin:
655- os.write(&this->_value._origin,sizeof(this->_value._origin));
656+ os.write((char*)&this->_value._origin,sizeof(this->_value._origin));
657 break;
658 case Bgp4_Attribute_AsPath:
659 this->_value._asPath->write(os,version);
660 break;
661 case Bgp4_Attribute_NextHop:
662- os.write(&this->_value._nextHop,sizeof(this->_value._nextHop));
663+ os.write((char*)&this->_value._nextHop,sizeof(this->_value._nextHop));
664 break;
665 case Bgp4_Attribute_MultiExitDisc:
666 g_ArtsLibInternal_Primitive.WriteUint32(os,this->_value._MED,
667@@ -654,7 +656,7 @@
668 break;
669 case Bgp4_Attribute_Community:
670 numCommunities = this->_value._community->size();
671- os.write(&numCommunities,sizeof(numCommunities));
672+ os.write((char*)&numCommunities,sizeof(numCommunities));
673 for (int commNum = 0; commNum < numCommunities; commNum++) {
674 g_ArtsLibInternal_Primitive.WriteUint32(os,
675 (*(this->_value._community))[commNum],
676@@ -680,7 +682,7 @@
677 //............................................................................
678 //
679 //----------------------------------------------------------------------------
680-int ArtsBgp4Attribute::write(int fd, uint8_t version = 0) const
681+int ArtsBgp4Attribute::write(int fd, uint8_t version /* = 0 */) const
682 {
683 uint8_t numCommunities;
684 int rc;
685@@ -855,7 +857,7 @@
686 //............................................................................
687 //
688 //----------------------------------------------------------------------------
689-uint16_t ArtsBgp4Attribute::Length(uint8_t version = 0) const
690+uint16_t ArtsBgp4Attribute::Length(uint8_t version /* = 0 */) const
691 {
692 uint16_t length = sizeof(this->_flags) + sizeof(this->_type);
693 switch (this->_type) {
694--- arts++-1-1-a9/classes/src/ArtsBgp4DPAttribute.cc.orig Sat Nov 16 01:46:41 2002
695+++ arts++-1-1-a9/classes/src/ArtsBgp4DPAttribute.cc Fri Feb 13 14:56:39 2004
696@@ -45,6 +45,8 @@
697 #include "ArtsPrimitive.hh"
698 #include "ArtsBgp4DPAttribute.hh"
699
700+using namespace std;
701+
702 static const string rcsid = "@(#) $Name$ $Id$";
703
704 //----------------------------------------------------------------------------
705@@ -132,7 +134,7 @@
706 //............................................................................
707 //
708 //----------------------------------------------------------------------------
709-istream & ArtsBgp4DPAttribute::read(istream & is, uint8_t version = 0)
710+istream & ArtsBgp4DPAttribute::read(istream & is, uint8_t version /* = 0 */)
711 {
712 g_ArtsLibInternal_Primitive.ReadUint16(is,this->_as,sizeof(this->_as));
713 g_ArtsLibInternal_Primitive.ReadUint32(is,this->_value,
714@@ -145,7 +147,7 @@
715 //............................................................................
716 //
717 //----------------------------------------------------------------------------
718-int ArtsBgp4DPAttribute::read(int fd, uint8_t version = 0)
719+int ArtsBgp4DPAttribute::read(int fd, uint8_t version /* = 0 */)
720 {
721 int rc;
722 int bytesRead = 0;
723@@ -169,7 +171,7 @@
724 //............................................................................
725 //
726 //----------------------------------------------------------------------------
727-ostream & ArtsBgp4DPAttribute::write(ostream & os, uint8_t version = 0) const
728+ostream & ArtsBgp4DPAttribute::write(ostream & os, uint8_t version /* = 0 */) const
729 {
730 g_ArtsLibInternal_Primitive.WriteUint16(os,this->_as,sizeof(this->_as));
731 g_ArtsLibInternal_Primitive.WriteUint32(os,this->_value,
732@@ -182,7 +184,7 @@
733 //............................................................................
734 //
735 //----------------------------------------------------------------------------
736-int ArtsBgp4DPAttribute::write(int fd, uint8_t version = 0) const
737+int ArtsBgp4DPAttribute::write(int fd, uint8_t version /* = 0 */) const
738 {
739 int rc;
740 int bytesWritten = 0;
741--- arts++-1-1-a9/classes/src/ArtsBgp4AsPathAttribute.cc.orig Sat Nov 16 01:46:41 2002
742+++ arts++-1-1-a9/classes/src/ArtsBgp4AsPathAttribute.cc Fri Feb 13 14:56:39 2004
743@@ -45,6 +45,8 @@
744 #include "ArtsPrimitive.hh"
745 #include "ArtsBgp4AsPathAttribute.hh"
746
747+using namespace std;
748+
749 static const string rcsid = "@(#) $Name$ $Id$";
750
751 //----------------------------------------------------------------------------
752@@ -117,7 +119,7 @@
753 //............................................................................
754 //
755 //----------------------------------------------------------------------------
756-istream & ArtsBgp4AsPathAttribute::read(istream & is, uint8_t version = 0)
757+istream & ArtsBgp4AsPathAttribute::read(istream & is, uint8_t version /* = 0 */)
758 {
759 ArtsBgp4AsPathSegment asPathSegment;
760 uint8_t numSegments;
761@@ -125,7 +127,7 @@
762 if (this->_segments.size() > 0)
763 this->_segments.erase(this->_segments.begin(),this->_segments.end());
764
765- is.read(&numSegments,sizeof(numSegments));
766+ is.read((char*)&numSegments,sizeof(numSegments));
767 if (numSegments > 0) {
768 this->_segments.reserve(numSegments);
769 for (uint8_t segmentNum = 0; segmentNum < numSegments; segmentNum++) {
770@@ -144,7 +146,7 @@
771 //............................................................................
772 //
773 //----------------------------------------------------------------------------
774-int ArtsBgp4AsPathAttribute::read(int fd, uint8_t version = 0)
775+int ArtsBgp4AsPathAttribute::read(int fd, uint8_t version /* = 0 */)
776 {
777 int rc;
778 int bytesRead = 0;
779@@ -175,10 +177,10 @@
780 //
781 //----------------------------------------------------------------------------
782 ostream & ArtsBgp4AsPathAttribute::write(ostream & os,
783- uint8_t version = 0) const
784+ uint8_t version /* = 0 */) const
785 {
786 uint8_t numSegments = this->_segments.size();
787- os.write(&numSegments,sizeof(numSegments));
788+ os.write((char*)&numSegments,sizeof(numSegments));
789 for (uint8_t segmentNum = 0; segmentNum < numSegments; segmentNum++) {
790 this->_segments[segmentNum].write(os,version);
791 }
792@@ -190,7 +192,7 @@
793 //............................................................................
794 //
795 //----------------------------------------------------------------------------
796-int ArtsBgp4AsPathAttribute::write(int fd, uint8_t version = 0) const
797+int ArtsBgp4AsPathAttribute::write(int fd, uint8_t version /* = 0 */) const
798 {
799 int rc;
800 int bytesWritten = 0;
801@@ -232,7 +234,7 @@
802 //............................................................................
803 //
804 //----------------------------------------------------------------------------
805-uint32_t ArtsBgp4AsPathAttribute::Length(uint8_t version = 0) const
806+uint32_t ArtsBgp4AsPathAttribute::Length(uint8_t version /* = 0 */) const
807 {
808 uint32_t length = sizeof(uint8_t);
809
810--- arts++-1-1-a9/classes/src/ArtsBgp4AsPathSegment.cc.orig Sat Nov 16 01:46:41 2002
811+++ arts++-1-1-a9/classes/src/ArtsBgp4AsPathSegment.cc Fri Feb 13 14:56:39 2004
812@@ -56,6 +56,8 @@
813 #include "ArtsPrimitive.hh"
814 #include "ArtsBgp4AsPathSegment.hh"
815
816+using namespace std;
817+
818 static const string rcsid = "@(#) $Name$ $Id$";
819
820 //----------------------------------------------------------------------------
821@@ -137,13 +139,13 @@
822 //............................................................................
823 //
824 //----------------------------------------------------------------------------
825-istream & ArtsBgp4AsPathSegment::read(istream & is, uint8_t version = 0)
826+istream & ArtsBgp4AsPathSegment::read(istream & is, uint8_t version /* = 0 */)
827 {
828 uint8_t numAses;
829 uint16_t as;
830
831- is.read(&this->_type,sizeof(this->_type));
832- is.read(&numAses,sizeof(numAses));
833+ is.read((char*)&this->_type,sizeof(this->_type));
834+ is.read((char*)&numAses,sizeof(numAses));
835 if (numAses > 0) {
836 this->_AS.reserve(numAses);
837 for (int asNum = 0; asNum < numAses; asNum++) {
838@@ -160,7 +162,7 @@
839 //............................................................................
840 //
841 //----------------------------------------------------------------------------
842-int ArtsBgp4AsPathSegment::read(int fd, uint8_t version = 0)
843+int ArtsBgp4AsPathSegment::read(int fd, uint8_t version /* = 0 */)
844 {
845 int rc;
846 uint8_t numAses;
847@@ -196,12 +198,12 @@
848 //
849 //----------------------------------------------------------------------------
850 ostream & ArtsBgp4AsPathSegment::write(ostream & os,
851- uint8_t version = 0) const
852+ uint8_t version /* = 0 */) const
853 {
854- os.write(&this->_type,sizeof(this->_type));
855+ os.write((char*)&this->_type,sizeof(this->_type));
856
857 uint8_t numAses = this->_AS.size();
858- os.write(&numAses,sizeof(numAses));
859+ os.write((char*)&numAses,sizeof(numAses));
860
861 for (int asNum = 0; asNum < numAses; asNum++) {
862 g_ArtsLibInternal_Primitive.WriteUint16(os,this->_AS[asNum],
863@@ -215,7 +217,7 @@
864 //............................................................................
865 //
866 //----------------------------------------------------------------------------
867-int ArtsBgp4AsPathSegment::write(int fd, uint8_t version = 0) const
868+int ArtsBgp4AsPathSegment::write(int fd, uint8_t version /* = 0 */) const
869 {
870 int rc;
871 uint8_t numAses;
872@@ -246,7 +248,7 @@
873 //............................................................................
874 //
875 //----------------------------------------------------------------------------
876-uint32_t ArtsBgp4AsPathSegment::Length(uint8_t version = 0) const
877+uint32_t ArtsBgp4AsPathSegment::Length(uint8_t version /* = 0 */) const
878 {
879 return(sizeof(this->_type) + sizeof(uint8_t) +
880 (sizeof(uint16_t) * this->_AS.size()));
881--- arts++-1-1-a9/classes/src/ArtsFileUtil.cc.orig Sat Nov 16 01:46:41 2002
882+++ arts++-1-1-a9/classes/src/ArtsFileUtil.cc Fri Feb 13 14:56:39 2004
883@@ -63,6 +63,9 @@
884 #include "ArtsDebug.hh"
885 #include "ArtsPackageVersion.hh"
886
887+#include <iterator>
888+using namespace std;
889+
890 typedef map<ArtsAggregatorMapKey,time_t,less<ArtsAggregatorMapKey> > \
891 IntervalStartMap_t;
892
893--- arts++-1-1-a9/classes/src/ArtsAsMatrixEntry.cc.orig Sat Nov 16 01:46:41 2002
894+++ arts++-1-1-a9/classes/src/ArtsAsMatrixEntry.cc Fri Feb 13 14:56:39 2004
895@@ -49,6 +49,8 @@
896 #include "ArtsAsMatrixEntry.hh"
897 #include "ArtsPrimitive.hh"
898
899+using namespace std;
900+
901 static const string rcsid = "@(#) $Name$ $Id$";
902
903 //-------------------------------------------------------------------------
904@@ -180,7 +182,7 @@
905 //.........................................................................
906 //
907 //-------------------------------------------------------------------------
908-uint32_t ArtsAsMatrixEntry::Length(uint8_t version = 0) const
909+uint32_t ArtsAsMatrixEntry::Length(uint8_t version /* = 0 */) const
910 {
911 uint32_t length;
912
913@@ -197,14 +199,14 @@
914 //.........................................................................
915 //
916 //-------------------------------------------------------------------------
917-istream& ArtsAsMatrixEntry::read(istream& is, uint8_t version = 0)
918+istream& ArtsAsMatrixEntry::read(istream& is, uint8_t version /* = 0 */)
919 {
920 uint8_t bytesize,
921 pktsize,
922 srcsize,
923 dstsize;
924
925- is.read(&this->_descriptor,sizeof(this->_descriptor));
926+ is.read((char*)&this->_descriptor,sizeof(this->_descriptor));
927
928 srcsize = (this->_descriptor & 0x01) + 1;
929 dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
930@@ -224,7 +226,7 @@
931 //.........................................................................
932 //
933 //-------------------------------------------------------------------------
934-int ArtsAsMatrixEntry::read(int fd, uint8_t version = 0)
935+int ArtsAsMatrixEntry::read(int fd, uint8_t version /* = 0 */)
936 {
937 uint8_t bytesize,
938 pktsize,
939@@ -277,14 +279,14 @@
940 //.........................................................................
941 //
942 //-------------------------------------------------------------------------
943-ostream & ArtsAsMatrixEntry::write(ostream & os, uint8_t version = 0) const
944+ostream & ArtsAsMatrixEntry::write(ostream & os, uint8_t version /* = 0 */) const
945 {
946 uint8_t bytesize,
947 pktsize,
948 srcsize,
949 dstsize;
950
951- os.write(&this->_descriptor,sizeof(this->_descriptor));
952+ os.write((char*)&this->_descriptor,sizeof(this->_descriptor));
953
954 srcsize = (this->_descriptor & 0x01) + 1;
955 dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
956@@ -304,7 +306,7 @@
957 //.........................................................................
958 //
959 //-------------------------------------------------------------------------
960-int ArtsAsMatrixEntry::write(int fd, uint8_t version = 0) const
961+int ArtsAsMatrixEntry::write(int fd, uint8_t version /* = 0 */) const
962 {
963 uint8_t bytesize,
964 pktsize,
965--- arts++-1-1-a9/classes/src/ArtsAsMatrix.cc.orig Sat Nov 16 01:46:41 2002
966+++ arts++-1-1-a9/classes/src/ArtsAsMatrix.cc Fri Feb 13 14:56:39 2004
967@@ -45,6 +45,8 @@
968 #include "Arts.hh"
969 #include "ArtsAsMatrix.hh"
970
971+using namespace std;
972+
973 static const string rcsid = "@(#) $Name$ $Id$";
974
975 //-------------------------------------------------------------------------
976--- arts++-1-1-a9/classes/src/ArtsHeader.cc.orig Mon Apr 28 22:02:55 2003
977+++ arts++-1-1-a9/classes/src/ArtsHeader.cc Fri Feb 13 14:56:39 2004
978@@ -51,6 +51,8 @@
979 #include "ArtsHeader.hh"
980 #include "ArtsPrimitive.hh"
981
982+using namespace std;
983+
984 typedef struct {
985 uint32_t identifier;
986 const char *name;
987@@ -135,23 +137,23 @@
988 uint32_t uIntDatum, idAndVersion;
989
990 uShortDatum = htons(this->_magic);
991- os.write(&uShortDatum,sizeof(uShortDatum));
992+ os.write((char*)&uShortDatum,sizeof(uShortDatum));
993
994 idAndVersion = (this->_identifier << 4) | this->_version;
995 uIntDatum = htonl(idAndVersion);
996- os.write(&uIntDatum,sizeof(uIntDatum));
997+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
998
999 uIntDatum = htonl(this->_flags);
1000- os.write(&uIntDatum,sizeof(uIntDatum));
1001+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
1002
1003 uShortDatum = htons(this->_numAttributes);
1004- os.write(&uShortDatum,sizeof(uShortDatum));
1005+ os.write((char*)&uShortDatum,sizeof(uShortDatum));
1006
1007 uIntDatum = htonl(this->_attrLength);
1008- os.write(&uIntDatum,sizeof(uIntDatum));
1009+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
1010
1011 uIntDatum = htonl(this->_dataLength);
1012- os.write(&uIntDatum,sizeof(uIntDatum));
1013+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
1014
1015 return(os);
1016 }
1017@@ -225,13 +227,13 @@
1018 uint32_t uIntDatum;
1019 uint32_t idAndVersion;
1020
1021- is.read(&uShortDatum,sizeof(uShortDatum));
1022+ is.read((char*)&uShortDatum,sizeof(uShortDatum));
1023 if (is.eof())
1024 return(is);
1025
1026 this->_magic = ntohs(uShortDatum);
1027
1028- is.read(&uIntDatum,sizeof(uIntDatum));
1029+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1030 if (is.eof())
1031 return(is);
1032
1033@@ -239,22 +241,22 @@
1034 this->_identifier = idAndVersion >> 4;
1035 this->_version = idAndVersion & 0x0f;
1036
1037- is.read(&uIntDatum,sizeof(uIntDatum));
1038+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1039 if (is.eof())
1040 return(is);
1041 this->_flags = ntohl(uIntDatum);
1042
1043- is.read(&uShortDatum,sizeof(uShortDatum));
1044+ is.read((char*)&uShortDatum,sizeof(uShortDatum));
1045 if (is.eof())
1046 return(is);
1047 this->_numAttributes = ntohs(uShortDatum);
1048
1049- is.read(&uIntDatum,sizeof(uIntDatum));
1050+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1051 if (is.eof())
1052 return(is);
1053 this->_attrLength = ntohl(uIntDatum);
1054
1055- is.read(&uIntDatum,sizeof(uIntDatum));
1056+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1057 if (is.eof())
1058 return(is);
1059 this->_dataLength = ntohl(uIntDatum);
1060--- arts++-1-1-a9/classes/src/ArtsAttribute.cc.orig Sat Nov 16 01:46:41 2002
1061+++ arts++-1-1-a9/classes/src/ArtsAttribute.cc Fri Feb 13 14:56:39 2004
1062@@ -487,10 +487,10 @@
1063
1064 idAndFormat = (this->_identifier << 8) | this->_format;
1065 uIntDatum = htonl(idAndFormat);
1066- os.write(&uIntDatum,sizeof(uIntDatum));
1067+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
1068
1069 uIntDatum = htonl(this->_length);
1070- os.write(&uIntDatum,sizeof(uIntDatum));
1071+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
1072
1073 switch (this->_identifier) {
1074 case artsC_ATTR_COMMENT:
1075@@ -499,16 +499,16 @@
1076 break;
1077 case artsC_ATTR_CREATION:
1078 uIntDatum = htonl(this->_value.creation);
1079- os.write(&uIntDatum,sizeof(uIntDatum));
1080+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
1081 break;
1082 case artsC_ATTR_PERIOD:
1083 uIntDatum = htonl(this->_value.period[0]);
1084- os.write(&uIntDatum,sizeof(uIntDatum));
1085+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
1086 uIntDatum = htonl(this->_value.period[1]);
1087- os.write(&uIntDatum,sizeof(uIntDatum));
1088+ os.write((char*)&uIntDatum,sizeof(uIntDatum));
1089 break;
1090 case artsC_ATTR_HOST:
1091- os.write(&this->_value.host,sizeof(this->_value.host));
1092+ os.write((char*)&this->_value.host,sizeof(this->_value.host));
1093 break;
1094 case artsC_ATTR_IFDESCR:
1095 ptr = this->_value.ifDescr->c_str();
1096@@ -516,14 +516,14 @@
1097 break;
1098 case artsC_ATTR_IFINDEX:
1099 uShortDatum = htons(this->_value.ifIndex);
1100- os.write(&uShortDatum,sizeof(uShortDatum));
1101+ os.write((char*)&uShortDatum,sizeof(uShortDatum));
1102 break;
1103 case artsC_ATTR_IFIPADDR:
1104- os.write(&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
1105+ os.write((char*)&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
1106 break;
1107 case artsC_ATTR_HOSTPAIR:
1108- os.write(&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
1109- os.write(&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
1110+ os.write((char*)&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
1111+ os.write((char*)&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
1112 break;
1113 default:
1114 break;
1115@@ -675,12 +675,12 @@
1116 break;
1117 }
1118
1119- is.read(&uIntDatum,sizeof(uIntDatum));
1120+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1121 idAndFormat = ntohl(uIntDatum);
1122 this->_identifier = idAndFormat >> 8;
1123 this->_format = idAndFormat & 0xff;
1124
1125- is.read(&uIntDatum,sizeof(uIntDatum));
1126+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1127 this->_length = ntohl(uIntDatum);
1128
1129 switch (this->_identifier) {
1130@@ -693,17 +693,17 @@
1131 free(ptr);
1132 break;
1133 case artsC_ATTR_CREATION:
1134- is.read(&uIntDatum,sizeof(uIntDatum));
1135+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1136 this->_value.creation = ntohl(uIntDatum);
1137 break;
1138 case artsC_ATTR_PERIOD:
1139- is.read(&uIntDatum,sizeof(uIntDatum));
1140+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1141 this->_value.period[0] = htonl(uIntDatum);
1142- is.read(&uIntDatum,sizeof(uIntDatum));
1143+ is.read((char*)&uIntDatum,sizeof(uIntDatum));
1144 this->_value.period[1] = htonl(uIntDatum);
1145 break;
1146 case artsC_ATTR_HOST:
1147- is.read(&this->_value.host,sizeof(this->_value.host));
1148+ is.read((char*)&this->_value.host,sizeof(this->_value.host));
1149 break;
1150 case artsC_ATTR_IFDESCR:
1151 ptr = (char *)malloc(this->_length - (sizeof(uint32_t) * 2));
1152@@ -714,15 +714,15 @@
1153 free(ptr);
1154 break;
1155 case artsC_ATTR_IFINDEX:
1156- is.read(&this->_value.ifIndex,sizeof(this->_value.ifIndex));
1157+ is.read((char*)&this->_value.ifIndex,sizeof(this->_value.ifIndex));
1158 this->_value.ifIndex = ntohs(this->_value.ifIndex);
1159 break;
1160 case artsC_ATTR_IFIPADDR:
1161- is.read(&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
1162+ is.read((char*)&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
1163 break;
1164 case artsC_ATTR_HOSTPAIR:
1165- is.read(&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
1166- is.read(&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
1167+ is.read((char*)&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
1168+ is.read((char*)&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
1169 break;
1170 default:
1171 break;
1172--- arts++-1-1-a9/classes/src/ArtsIpPathEntry.cc.orig Sun Jun 1 07:25:31 2003
1173+++ arts++-1-1-a9/classes/src/ArtsIpPathEntry.cc Fri Feb 13 14:56:39 2004
1174@@ -52,6 +52,8 @@
1175 #include "ArtsIpPathEntry.hh"
1176 #include "ArtsPrimitive.hh"
1177
1178+using namespace std;
1179+
1180 static const string rcsid = "@(#) $Name$ $Id$";
1181
1182 //------------------------------------------------------------------------
1183@@ -107,14 +109,14 @@
1184 }
1185
1186
1187-istream& ArtsIpPathEntry::read(istream& is, uint8_t version = 0,
1188- uint8_t flags = 0)
1189+istream& ArtsIpPathEntry::read(istream& is, uint8_t version /* = 0 */,
1190+ uint8_t flags /* = 0 */)
1191 {
1192- is.read(&this->_hopNum,sizeof(this->_hopNum));
1193+ is.read((char*)&this->_hopNum,sizeof(this->_hopNum));
1194 if (! is)
1195 return(is);
1196
1197- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
1198+ is.read((char*)&this->_ipAddr,sizeof(this->_ipAddr));
1199 if (! is)
1200 return(is);
1201
1202@@ -125,14 +127,14 @@
1203 if (! is)
1204 return(is);
1205
1206- is.read(&this->_numTries,sizeof(this->_numTries));
1207+ is.read((char*)&this->_numTries,sizeof(this->_numTries));
1208 }
1209 }
1210
1211 return(is);
1212 }
1213
1214-int ArtsIpPathEntry::read(int fd, uint8_t version = 0, uint8_t flags = 0)
1215+int ArtsIpPathEntry::read(int fd, uint8_t version /* = 0 */, uint8_t flags /* = 0 */)
1216 {
1217 int rc;
1218 int bytesRead = 0;
1219@@ -169,24 +171,24 @@
1220 return(bytesRead);
1221 }
1222
1223-ostream& ArtsIpPathEntry::write(ostream& os, uint8_t version = 0,
1224- uint8_t flags = 0) const
1225+ostream& ArtsIpPathEntry::write(ostream& os, uint8_t version /* = 0 */,
1226+ uint8_t flags /* = 0 */) const
1227 {
1228- os.write(&this->_hopNum,sizeof(this->_hopNum));
1229- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
1230+ os.write((char*)&this->_hopNum,sizeof(this->_hopNum));
1231+ os.write((char*)&this->_ipAddr,sizeof(this->_ipAddr));
1232
1233 if (version >= 1) {
1234 // Version 1 always has iRTT.
1235 if (version == 1 || flags & k_rtt) {
1236 g_ArtsLibInternal_Primitive.WriteUint32(os, _rtt, sizeof(_rtt));
1237- os.write(&this->_numTries,sizeof(this->_numTries));
1238+ os.write((char*)&this->_numTries,sizeof(this->_numTries));
1239 }
1240 }
1241
1242 return(os);
1243 }
1244
1245-int ArtsIpPathEntry::write(int fd, uint8_t version = 0, uint8_t flags = 0) const
1246+int ArtsIpPathEntry::write(int fd, uint8_t version /* = 0 */, uint8_t flags /* = 0 */) const
1247 {
1248 int rc;
1249 int bytesWritten = 0;
1250--- arts++-1-1-a9/classes/src/ArtsIpPathData.cc.orig Sat Jun 7 02:05:09 2003
1251+++ arts++-1-1-a9/classes/src/ArtsIpPathData.cc Fri Feb 13 15:00:39 2004
1252@@ -53,6 +53,8 @@
1253 #include "Arts.hh"
1254 #include "ArtsIpPathData.hh"
1255
1256+using namespace std;
1257+
1258 static const string rcsid = "@(#) $Name$ $Id$";
1259 //------------------------------------------------------------------------
1260 // ArtsIpPathData::ArtsIpPathData(ipv4addr_t src, ipv4addr_t dst)
1261@@ -189,7 +191,7 @@
1262 #endif
1263 }
1264
1265-uint32_t ArtsIpPathData::Length(uint8_t version = 0, uint8_t flags = 0) const
1266+uint32_t ArtsIpPathData::Length(uint8_t version /* = 0 */, uint8_t flags /* = 0 */) const
1267 {
1268 uint32_t len = sizeof(_src) + sizeof(_dst) + sizeof(_hopDistance) +
1269 sizeof(_numHops);
1270@@ -217,38 +219,38 @@
1271 return(len);
1272 }
1273
1274-ostream& ArtsIpPathData::write(ostream& os, uint8_t version = 0,
1275- uint8_t flags = 0)
1276+ostream& ArtsIpPathData::write(ostream& os, uint8_t version /* = 0 */,
1277+ uint8_t flags /* = 0 */)
1278 {
1279 uint32_t timeDatum;
1280 uint8_t repliedAndNumHops;
1281
1282- os.write(&this->_src,sizeof(this->_src));
1283- os.write(&this->_dst,sizeof(this->_dst));
1284+ os.write((char*)&this->_src,sizeof(this->_src));
1285+ os.write((char*)&this->_dst,sizeof(this->_dst));
1286
1287 if (version >= 2) {
1288 timeDatum = htonl(_rtt);
1289 } else {
1290 timeDatum = htonl(_rtt / 1000000);
1291- os.write(&timeDatum,sizeof(timeDatum));
1292+ os.write((char*)&timeDatum,sizeof(timeDatum));
1293 timeDatum = htonl(_rtt % 1000000);
1294 }
1295- os.write(&timeDatum,sizeof(timeDatum));
1296+ os.write((char*)&timeDatum,sizeof(timeDatum));
1297
1298- os.write(&this->_hopDistance,sizeof(this->_hopDistance));
1299+ os.write((char*)&this->_hopDistance,sizeof(this->_hopDistance));
1300
1301 repliedAndNumHops = (this->_destinationReplied << 7) | this->_numHops;
1302- os.write(&repliedAndNumHops,sizeof(repliedAndNumHops));
1303+ os.write((char*)&repliedAndNumHops,sizeof(repliedAndNumHops));
1304
1305 if (version >= 1) {
1306 // Only version 1 has conditional reason codes.
1307 if (version != 1 || _destinationReplied) {
1308- os.write(&_haltReason, sizeof(_haltReason));
1309- os.write(&_haltReasonData, sizeof(_haltReasonData));
1310+ os.write((char*)&_haltReason, sizeof(_haltReason));
1311+ os.write((char*)&_haltReasonData, sizeof(_haltReasonData));
1312 }
1313 }
1314 if (version >= 2) {
1315- os.write(&_replyTtl, sizeof(_replyTtl));
1316+ os.write((char*)&_replyTtl, sizeof(_replyTtl));
1317 }
1318
1319 // sort by hop number
1320@@ -263,7 +265,7 @@
1321 return(os);
1322 }
1323
1324-int ArtsIpPathData::write(int fd, uint8_t version = 0, uint8_t flags = 0)
1325+int ArtsIpPathData::write(int fd, uint8_t version /* = 0 */, uint8_t flags /* = 0 */)
1326 {
1327 uint32_t timeDatum;
1328 uint8_t repliedAndNumHops;
1329@@ -352,40 +354,40 @@
1330 return(bytesWritten);
1331 }
1332
1333-istream& ArtsIpPathData::read(istream& is, uint8_t version = 0,
1334- uint8_t flags = 0)
1335+istream& ArtsIpPathData::read(istream& is, uint8_t version /* = 0 */,
1336+ uint8_t flags /* = 0 */)
1337 {
1338 uint32_t timeDatum;
1339 uint8_t repliedAndNumHops;
1340 size_t hopNum;
1341
1342- is.read(&this->_src,sizeof(this->_src));
1343- is.read(&this->_dst,sizeof(this->_dst));
1344+ is.read((char*)&this->_src,sizeof(this->_src));
1345+ is.read((char*)&this->_dst,sizeof(this->_dst));
1346
1347- is.read(&timeDatum,sizeof(timeDatum));
1348+ is.read((char*)&timeDatum,sizeof(timeDatum));
1349 if (version >= 2) {
1350 _rtt = ntohl(timeDatum);
1351 } else {
1352 _rtt = ntohl(timeDatum) * 1000000;
1353- is.read(&timeDatum,sizeof(timeDatum));
1354+ is.read((char*)&timeDatum,sizeof(timeDatum));
1355 _rtt += ntohl(timeDatum);
1356 }
1357
1358- is.read(&this->_hopDistance,sizeof(this->_hopDistance));
1359+ is.read((char*)&this->_hopDistance,sizeof(this->_hopDistance));
1360
1361- is.read(&repliedAndNumHops,sizeof(repliedAndNumHops));
1362+ is.read((char*)&repliedAndNumHops,sizeof(repliedAndNumHops));
1363 this->_destinationReplied = repliedAndNumHops >> 7;
1364 this->_numHops = repliedAndNumHops & 0x7f;
1365
1366 if (version >= 1) {
1367 // Only version 1 has conditional reason codes.
1368 if (version != 1 || _destinationReplied) {
1369- is.read(&_haltReason, sizeof(_haltReason));
1370- is.read(&_haltReasonData, sizeof(_haltReasonData));
1371+ is.read((char*)&_haltReason, sizeof(_haltReason));
1372+ is.read((char*)&_haltReasonData, sizeof(_haltReasonData));
1373 }
1374 }
1375 if (version >= 2) {
1376- is.read(&_replyTtl, sizeof(_replyTtl));
1377+ is.read((char*)&_replyTtl, sizeof(_replyTtl));
1378 }
1379
1380 if (this->_path.size() > 0) {
1381@@ -406,7 +408,7 @@
1382 return(is);
1383 }
1384
1385-int ArtsIpPathData::read(int fd, uint8_t version = 0, uint8_t flags = 0)
1386+int ArtsIpPathData::read(int fd, uint8_t version /* = 0 */, uint8_t flags /* = 0 */)
1387 {
1388 uint32_t timeDatum;
1389 uint8_t repliedAndNumHops;
1390@@ -749,7 +751,7 @@
1391 //
1392 //----------------------------------------------------------------------------
1393 void ArtsIpPathData::AddHop(ipv4addr_t ipAddr, uint8_t hopNum,
1394- const struct timeval & rtt, uint8_t numTries=-1)
1395+ const struct timeval & rtt, uint8_t numTries /* =-1 */)
1396 {
1397 ArtsIpPathEntry pathEntry(ipAddr,hopNum);
1398 pathEntry.Rtt(rtt);
1399--- arts++-1-1-a9/classes/src/ArtsAsMatrixData.cc.orig Sat Nov 16 01:46:41 2002
1400+++ arts++-1-1-a9/classes/src/ArtsAsMatrixData.cc Fri Feb 13 14:56:39 2004
1401@@ -44,6 +44,8 @@
1402 #include "ArtsAsMatrixData.hh"
1403 #include "ArtsPrimitive.hh"
1404
1405+using namespace std;
1406+
1407 static const string rcsid = "@(#) $Name$ $Id$";
1408
1409 //----------------------------------------------------------------------------
1410@@ -81,7 +83,7 @@
1411 //.........................................................................
1412 //
1413 //-------------------------------------------------------------------------
1414-istream & ArtsAsMatrixData::read(istream& is, uint8_t version = 0)
1415+istream & ArtsAsMatrixData::read(istream& is, uint8_t version /* = 0 */)
1416 {
1417 uint32_t entryNum;
1418 ArtsAsMatrixEntry asEntry;
1419@@ -106,7 +108,7 @@
1420 //.........................................................................
1421 //
1422 //-------------------------------------------------------------------------
1423-int ArtsAsMatrixData::read(int fd, uint8_t version = 0)
1424+int ArtsAsMatrixData::read(int fd, uint8_t version /* = 0 */)
1425 {
1426 uint32_t entryNum;
1427 ArtsAsMatrixEntry asEntry;
1428@@ -161,7 +163,7 @@
1429 //.........................................................................
1430 //
1431 //-------------------------------------------------------------------------
1432-ostream & ArtsAsMatrixData::write(ostream& os, uint8_t version = 0)
1433+ostream & ArtsAsMatrixData::write(ostream& os, uint8_t version /* = 0 */)
1434 {
1435 uint32_t entryNum;
1436
1437@@ -183,7 +185,7 @@
1438 //.........................................................................
1439 //
1440 //-------------------------------------------------------------------------
1441-int ArtsAsMatrixData::write(int fd, uint8_t version = 0)
1442+int ArtsAsMatrixData::write(int fd, uint8_t version /* = 0 */)
1443 {
1444 uint32_t entryNum;
1445 int rc;
1446@@ -235,7 +237,7 @@
1447 //.........................................................................
1448 //
1449 //-------------------------------------------------------------------------
1450-uint32_t ArtsAsMatrixData::Length(uint8_t version = 0) const
1451+uint32_t ArtsAsMatrixData::Length(uint8_t version /* = 0 */) const
1452 {
1453 uint32_t length = 0;
1454
1455--- arts++-1-1-a9/classes/src/ArtsBitString.cc.orig Sat Nov 16 01:46:41 2002
1456+++ arts++-1-1-a9/classes/src/ArtsBitString.cc Fri Feb 13 14:56:39 2004
1457@@ -48,6 +48,8 @@
1458
1459 #include "ArtsBitString.hh"
1460
1461+using namespace std;
1462+
1463 static const string rcsid = "@(#) $Name$ $Id$";
1464
1465 //-------------------------------------------------------------------------
1466--- arts++-1-1-a9/classes/src/ArtsIpPath.cc.orig Sat Nov 16 01:46:42 2002
1467+++ arts++-1-1-a9/classes/src/ArtsIpPath.cc Fri Feb 13 14:56:39 2004
1468@@ -46,6 +46,8 @@
1469 #include "Arts.hh"
1470 #include "ArtsIpPath.hh"
1471
1472+using namespace std;
1473+
1474 static const string rcsid = "@(#) $Name$ $Id$";
1475
1476 //-------------------------------------------------------------------------
1477--- arts++-1-1-a9/classes/src/ArtsAsMatrixAggregatorMap.cc.orig Sat Nov 16 01:46:41 2002
1478+++ arts++-1-1-a9/classes/src/ArtsAsMatrixAggregatorMap.cc Fri Feb 13 14:56:39 2004
1479@@ -53,6 +53,9 @@
1480
1481 #include "ArtsAsMatrixAggregatorMap.hh"
1482
1483+#include <iterator>
1484+using namespace std;
1485+
1486 static const string rcsid = "@(#) $Name$ $Id$";
1487
1488 //-------------------------------------------------------------------------
1489--- arts++-1-1-a9/classes/src/ArtsBgp4AggregatorAttribute.cc.orig Sat Nov 16 01:46:41 2002
1490+++ arts++-1-1-a9/classes/src/ArtsBgp4AggregatorAttribute.cc Fri Feb 13 14:56:39 2004
1491@@ -45,6 +45,8 @@
1492 #include "ArtsPrimitive.hh"
1493 #include "ArtsBgp4AggregatorAttribute.hh"
1494
1495+using namespace std;
1496+
1497 static const string rcsid = "@(#) $Name$ $Id$";
1498
1499 //----------------------------------------------------------------------------
1500@@ -154,10 +156,10 @@
1501 //
1502 //----------------------------------------------------------------------------
1503 istream & ArtsBgp4AggregatorAttribute::read(istream & is,
1504- uint8_t version = 0)
1505+ uint8_t version /* = 0 */)
1506 {
1507 g_ArtsLibInternal_Primitive.ReadUint16(is,this->_AS,sizeof(this->_AS));
1508- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
1509+ is.read((char*)&this->_ipAddr,sizeof(this->_ipAddr));
1510 return(is);
1511 }
1512
1513@@ -166,7 +168,7 @@
1514 //............................................................................
1515 //
1516 //----------------------------------------------------------------------------
1517-int ArtsBgp4AggregatorAttribute::read(int fd, uint8_t version = 0)
1518+int ArtsBgp4AggregatorAttribute::read(int fd, uint8_t version /* = 0 */)
1519 {
1520 int rc;
1521 int bytesRead = 0;
1522@@ -190,10 +192,10 @@
1523 //
1524 //----------------------------------------------------------------------------
1525 ostream & ArtsBgp4AggregatorAttribute::write(ostream & os,
1526- uint8_t version = 0) const
1527+ uint8_t version /* = 0 */) const
1528 {
1529 g_ArtsLibInternal_Primitive.WriteUint16(os,this->_AS,sizeof(this->_AS));
1530- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
1531+ os.write((char*)&this->_ipAddr,sizeof(this->_ipAddr));
1532 return(os);
1533 }
1534
1535@@ -202,7 +204,7 @@
1536 //............................................................................
1537 //
1538 //----------------------------------------------------------------------------
1539-int ArtsBgp4AggregatorAttribute::write(int fd, uint8_t version = 0) const
1540+int ArtsBgp4AggregatorAttribute::write(int fd, uint8_t version /* = 0 */) const
1541 {
1542 int rc;
1543 int bytesWritten = 0;
1544@@ -225,7 +227,7 @@
1545 //............................................................................
1546 //
1547 //----------------------------------------------------------------------------
1548-uint32_t ArtsBgp4AggregatorAttribute::Length(uint8_t version = 0) const
1549+uint32_t ArtsBgp4AggregatorAttribute::Length(uint8_t version /* = 0 */) const
1550 {
1551 return(sizeof(this->_AS) + sizeof(this->_ipAddr));
1552 }
1553--- arts++-1-1-a9/classes/src/ArtsBgp4Prefix.cc.orig Sat Nov 16 01:46:41 2002
1554+++ arts++-1-1-a9/classes/src/ArtsBgp4Prefix.cc Fri Feb 13 14:56:39 2004
1555@@ -48,6 +48,8 @@
1556
1557 #include "ArtsBgp4Prefix.hh"
1558
1559+using namespace std;
1560+
1561 static const string rcsid = "@(#) $Name$ $Id$";
1562
1563 //-------------------------------------------------------------------------
1564--- arts++-1-1-a9/classes/src/ArtsBgp4RouteEntry.cc.orig Sat Nov 16 01:46:41 2002
1565+++ arts++-1-1-a9/classes/src/ArtsBgp4RouteEntry.cc Fri Feb 13 14:56:39 2004
1566@@ -44,6 +44,8 @@
1567 #include "ArtsPrimitive.hh"
1568 #include "ArtsBgp4RouteEntry.hh"
1569
1570+using namespace std;
1571+
1572 static const string rcsid = "@(#) $Name$ $Id$";
1573
1574 //----------------------------------------------------------------------------
1575@@ -122,7 +124,7 @@
1576 //............................................................................
1577 //
1578 //----------------------------------------------------------------------------
1579-istream & ArtsBgp4RouteEntry::read(istream & is, uint8_t version = 0)
1580+istream & ArtsBgp4RouteEntry::read(istream & is, uint8_t version /* = 0 */)
1581 {
1582 ArtsBgp4Attribute bgp4Attribute;
1583
1584@@ -186,7 +188,7 @@
1585 //............................................................................
1586 //
1587 //----------------------------------------------------------------------------
1588-int ArtsBgp4RouteEntry::read(int fd, uint8_t version = 0)
1589+int ArtsBgp4RouteEntry::read(int fd, uint8_t version /* = 0 */)
1590 {
1591 int rc;
1592 ArtsBgp4Attribute bgp4Attribute;
1593@@ -291,7 +293,7 @@
1594 //............................................................................
1595 //
1596 //----------------------------------------------------------------------------
1597-ostream & ArtsBgp4RouteEntry::write(ostream & os, uint8_t version = 0) const
1598+ostream & ArtsBgp4RouteEntry::write(ostream & os, uint8_t version /* = 0 */) const
1599 {
1600 g_ArtsLibInternal_Primitive.WriteUint32(os,this->_attrIndex,
1601 sizeof(this->_attrIndex));
1602@@ -309,7 +311,7 @@
1603 //............................................................................
1604 //
1605 //----------------------------------------------------------------------------
1606-int ArtsBgp4RouteEntry::write(int fd, uint8_t version = 0) const
1607+int ArtsBgp4RouteEntry::write(int fd, uint8_t version /* = 0 */) const
1608 {
1609 int rc;
1610 int bytesWritten = 0;
1611@@ -337,7 +339,7 @@
1612 //............................................................................
1613 //
1614 //----------------------------------------------------------------------------
1615-uint32_t ArtsBgp4RouteEntry::Length(uint8_t version = 0) const
1616+uint32_t ArtsBgp4RouteEntry::Length(uint8_t version /* = 0 */) const
1617 {
1618 uint32_t length = sizeof(this->_attrIndex);
1619 vector<ArtsBgp4Attribute>::const_iterator bgp4AttrIter;
1620--- arts++-1-1-a9/classes/src/ArtsBgp4RouteTableData.cc.orig Sat Nov 16 01:46:41 2002
1621+++ arts++-1-1-a9/classes/src/ArtsBgp4RouteTableData.cc Fri Feb 13 14:56:39 2004
1622@@ -45,6 +45,8 @@
1623 #include "ArtsPrimitive.hh"
1624 #include "ArtsBgp4RouteTableData.hh"
1625
1626+using namespace std;
1627+
1628 static const string rcsid = "@(#) $Name$ $Id$";
1629
1630 //----------------------------------------------------------------------------
1631@@ -114,7 +116,7 @@
1632 //............................................................................
1633 //
1634 //----------------------------------------------------------------------------
1635-istream & ArtsBgp4RouteTableData::read(istream & is, uint8_t version = 0)
1636+istream & ArtsBgp4RouteTableData::read(istream & is, uint8_t version /* = 0 */)
1637 {
1638 uint32_t numRoutes;
1639 ArtsBgp4RouteEntry routeEntry;
1640@@ -134,7 +136,7 @@
1641 //............................................................................
1642 //
1643 //----------------------------------------------------------------------------
1644-int ArtsBgp4RouteTableData::read(int fd, uint8_t version = 0)
1645+int ArtsBgp4RouteTableData::read(int fd, uint8_t version /* = 0 */)
1646 {
1647 uint32_t numRoutes;
1648 ArtsBgp4RouteEntry routeEntry;
1649@@ -165,7 +167,7 @@
1650 //
1651 //----------------------------------------------------------------------------
1652 ostream & ArtsBgp4RouteTableData::write(ostream & os,
1653- uint8_t version = 0) const
1654+ uint8_t version /* = 0 */) const
1655 {
1656 Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
1657
1658@@ -185,7 +187,7 @@
1659 //............................................................................
1660 //
1661 //----------------------------------------------------------------------------
1662-int ArtsBgp4RouteTableData::write(int fd, uint8_t version = 0) const
1663+int ArtsBgp4RouteTableData::write(int fd, uint8_t version /* = 0 */) const
1664 {
1665 Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
1666 int rc;
1667@@ -216,7 +218,7 @@
1668 //............................................................................
1669 //
1670 //----------------------------------------------------------------------------
1671-uint32_t ArtsBgp4RouteTableData::Length(uint8_t version = 0) const
1672+uint32_t ArtsBgp4RouteTableData::Length(uint8_t version /* = 0 */) const
1673 {
1674 uint32_t length = sizeof(uint32_t);
1675 Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
1676--- arts++-1-1-a9/classes/src/ArtsBgp4RouteTable.cc.orig Sat Nov 16 01:46:41 2002
1677+++ arts++-1-1-a9/classes/src/ArtsBgp4RouteTable.cc Fri Feb 13 14:56:39 2004
1678@@ -43,6 +43,8 @@
1679 #include <string>
1680 #include "ArtsBgp4RouteTable.hh"
1681
1682+using namespace std;
1683+
1684 static const string rcsid = "@(#) $Name$ $Id$";
1685
1686 //----------------------------------------------------------------------------
1687--- arts++-1-1-a9/classes/src/ArtsIfIndexSelectionSet.lex.orig Sat Nov 16 01:46:42 2002
1688+++ arts++-1-1-a9/classes/src/ArtsIfIndexSelectionSet.lex Fri Feb 13 14:56:39 2004
1689@@ -57,6 +57,8 @@
1690
1691 #include "ArtsIfIndexSelectionSet.hh"
1692
1693+using namespace std;
1694+
1695 static const string rcsid = "@(#) $Name$ $Id$";
1696
1697 %}
1698--- arts++-1-1-a9/classes/src/ArtsInterfaceMatrixEntry.cc.orig Sat Nov 16 01:46:42 2002
1699+++ arts++-1-1-a9/classes/src/ArtsInterfaceMatrixEntry.cc Fri Feb 13 14:56:39 2004
1700@@ -214,7 +214,7 @@
1701 //.........................................................................
1702 //
1703 //-------------------------------------------------------------------------
1704-uint32_t ArtsInterfaceMatrixEntry::Length(uint8_t version = 0) const
1705+uint32_t ArtsInterfaceMatrixEntry::Length(uint8_t version /* = 0 */) const
1706 {
1707 uint32_t length;
1708 length = (sizeof(this->_descriptor) +
1709@@ -231,11 +231,11 @@
1710 //.........................................................................
1711 //
1712 //-------------------------------------------------------------------------
1713-istream & ArtsInterfaceMatrixEntry::read(istream& is, uint8_t version = 0)
1714+istream & ArtsInterfaceMatrixEntry::read(istream& is, uint8_t version /* = 0 */)
1715 {
1716 uint8_t bytesize, pktsize, srcsize, dstsize;
1717
1718- is.read(&this->_descriptor,sizeof(this->_descriptor));
1719+ is.read((char*)&this->_descriptor,sizeof(this->_descriptor));
1720
1721 srcsize = (this->_descriptor & 0x01) + 1;
1722 dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
1723@@ -255,7 +255,7 @@
1724 //.........................................................................
1725 //
1726 //-------------------------------------------------------------------------
1727-int ArtsInterfaceMatrixEntry::read(int fd, uint8_t version = 0)
1728+int ArtsInterfaceMatrixEntry::read(int fd, uint8_t version /* = 0 */)
1729 {
1730 uint8_t bytesize, pktsize, srcsize, dstsize;
1731 int rc;
1732@@ -307,11 +307,11 @@
1733 //
1734 //-------------------------------------------------------------------------
1735 ostream & ArtsInterfaceMatrixEntry::write(ostream& os,
1736- uint8_t version = 0) const
1737+ uint8_t version /* = 0 */) const
1738 {
1739 uint8_t bytesize, pktsize, srcsize, dstsize;
1740
1741- os.write(&this->_descriptor,sizeof(this->_descriptor));
1742+ os.write((char*)&this->_descriptor,sizeof(this->_descriptor));
1743
1744 srcsize = (this->_descriptor & 0x01) + 1;
1745 dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
1746@@ -331,7 +331,7 @@
1747 //.........................................................................
1748 //
1749 //-------------------------------------------------------------------------
1750-int ArtsInterfaceMatrixEntry::write(int fd, uint8_t version = 0) const
1751+int ArtsInterfaceMatrixEntry::write(int fd, uint8_t version /* = 0 */) const
1752 {
1753 uint8_t bytesize, pktsize, srcsize, dstsize;
1754 int rc;
1755--- arts++-1-1-a9/classes/src/ArtsPortChoice.cc.orig Sat Nov 16 01:46:42 2002
1756+++ arts++-1-1-a9/classes/src/ArtsPortChoice.cc Fri Feb 13 15:33:17 2004
1757@@ -49,6 +49,8 @@
1758 #include "ArtsPrimitive.hh"
1759 #include "ArtsPortChoice.hh"
1760
1761+using namespace std;
1762+
1763 static const string rcsid = "@(#) $Name$ $Id$";
1764
1765 //-------------------------------------------------------------------------
1766@@ -293,7 +295,7 @@
1767 {
1768 uint8_t portLength;
1769
1770- is.read(&this->_flags,sizeof(this->_flags));
1771+ is.read((char*)&this->_flags,sizeof(this->_flags));
1772 if (!is)
1773 return(is);
1774
1775@@ -364,7 +366,7 @@
1776 {
1777 uint8_t portLength;
1778
1779- os.write(&this->_flags,sizeof(this->_flags));
1780+ os.write((char*)&this->_flags,sizeof(this->_flags));
1781
1782 portLength = 1;
1783 if (this->_flags & this->k_firstPortLengthMask)
1784--- arts++-1-1-a9/classes/src/ArtsPortChooser.lex.orig Sat Nov 16 01:46:42 2002
1785+++ arts++-1-1-a9/classes/src/ArtsPortChooser.lex Fri Feb 13 15:35:00 2004
1786@@ -52,6 +52,8 @@
1787 #include "ArtsPrimitive.hh"
1788 #include "ArtsPortChooser.hh"
1789
1790+using namespace std;
1791+
1792 extern char *portchoosertext;
1793
1794 static const string rcsid = "@(#) $Name$ $Id$";
1795@@ -233,7 +235,7 @@
1796 //.........................................................................
1797 //
1798 //-------------------------------------------------------------------------
1799-uint32_t ArtsPortChooser::Length(uint8_t version = 0) const
1800+uint32_t ArtsPortChooser::Length(uint8_t version /* = 0 */) const
1801 {
1802 uint32_t length = 0;
1803 vector<ArtsPortChoice>::const_iterator choiceIter;
1804--- arts++-1-1-a9/classes/src/ArtsInterfaceMatrixData.cc.orig Sat Nov 16 01:46:42 2002
1805+++ arts++-1-1-a9/classes/src/ArtsInterfaceMatrixData.cc Fri Feb 13 15:06:47 2004
1806@@ -44,6 +44,8 @@
1807 #include "ArtsInterfaceMatrixData.hh"
1808 #include "ArtsPrimitive.hh"
1809
1810+using namespace std;
1811+
1812 static const string rcsid = "@(#) $Name$ $Id$";
1813
1814 //----------------------------------------------------------------------------
1815@@ -81,7 +83,7 @@
1816 //.........................................................................
1817 //
1818 //-------------------------------------------------------------------------
1819-istream & ArtsInterfaceMatrixData::read(istream& is, uint8_t version = 0)
1820+istream & ArtsInterfaceMatrixData::read(istream& is, uint8_t version /* = 0 */)
1821 {
1822 uint32_t entryNum;
1823 ArtsInterfaceMatrixEntry interfaceEntry;
1824@@ -106,7 +108,7 @@
1825 //.........................................................................
1826 //
1827 //-------------------------------------------------------------------------
1828-int ArtsInterfaceMatrixData::read(int fd, uint8_t version = 0)
1829+int ArtsInterfaceMatrixData::read(int fd, uint8_t version /* = 0 */)
1830 {
1831 uint32_t entryNum;
1832 // ArtsPrimitive ioHelper;
1833@@ -163,7 +165,7 @@
1834 //
1835 //-------------------------------------------------------------------------
1836 ostream & ArtsInterfaceMatrixData::write(ostream& os,
1837- uint8_t version = 0)
1838+ uint8_t version /* = 0 */)
1839 {
1840 uint32_t entryNum;
1841
1842@@ -185,7 +187,7 @@
1843 //.........................................................................
1844 //
1845 //-------------------------------------------------------------------------
1846-int ArtsInterfaceMatrixData::write(int fd, uint8_t version = 0)
1847+int ArtsInterfaceMatrixData::write(int fd, uint8_t version /* = 0 */)
1848 {
1849 uint32_t entryNum;
1850 int rc;
1851@@ -237,7 +239,7 @@
1852 //.........................................................................
1853 //
1854 //-------------------------------------------------------------------------
1855-uint32_t ArtsInterfaceMatrixData::Length(uint8_t version = 0) const
1856+uint32_t ArtsInterfaceMatrixData::Length(uint8_t version /* = 0 */) const
1857 {
1858 uint32_t length = 0;
1859
1860--- arts++-1-1-a9/classes/src/ArtsInterfaceMatrix.cc.orig Sat Nov 16 01:46:42 2002
1861+++ arts++-1-1-a9/classes/src/ArtsInterfaceMatrix.cc Fri Feb 13 15:07:21 2004
1862@@ -45,6 +45,8 @@
1863 #include "Arts.hh"
1864 #include "ArtsInterfaceMatrix.hh"
1865
1866+using namespace std;
1867+
1868 static const string rcsid = "@(#) $Name$ $Id$";
1869
1870 //-------------------------------------------------------------------------
1871--- arts++-1-1-a9/classes/src/ArtsNextHopTableAggregatorMap.cc.orig Sat Nov 16 01:46:42 2002
1872+++ arts++-1-1-a9/classes/src/ArtsNextHopTableAggregatorMap.cc Fri Feb 13 15:30:31 2004
1873@@ -53,6 +53,9 @@
1874
1875 #include "ArtsNextHopTableAggregatorMap.hh"
1876
1877+#include <iterator>
1878+using namespace std;
1879+
1880 static const string rcsid = "@(#) $Name$ $Id$";
1881
1882 //-------------------------------------------------------------------------
1883--- arts++-1-1-a9/classes/src/ArtsInterfaceMatrixAggregatorMap.cc.orig Sat Nov 16 01:46:42 2002
1884+++ arts++-1-1-a9/classes/src/ArtsInterfaceMatrixAggregatorMap.cc Fri Feb 13 15:10:12 2004
1885@@ -53,6 +53,9 @@
1886
1887 #include "ArtsInterfaceMatrixAggregatorMap.hh"
1888
1889+#include <iterator>
1890+using namespace std;
1891+
1892 static const string rcsid = "@(#) $Name$ $Id$";
1893
1894 //-------------------------------------------------------------------------
1895--- arts++-1-1-a9/classes/src/ArtsPortMatrixEntry.cc.orig Sat Nov 16 01:46:42 2002
1896+++ arts++-1-1-a9/classes/src/ArtsPortMatrixEntry.cc Fri Feb 13 15:39:47 2004
1897@@ -49,6 +49,8 @@
1898 #include "ArtsPortMatrixEntry.hh"
1899 #include "ArtsPrimitive.hh"
1900
1901+using namespace std;
1902+
1903 static const string rcsid = "@(#) $Name$ $Id$";
1904
1905 //-------------------------------------------------------------------------
1906@@ -176,7 +178,7 @@
1907 //.........................................................................
1908 //
1909 //-------------------------------------------------------------------------
1910-uint32_t ArtsPortMatrixEntry::Length(uint8_t version = 0) const
1911+uint32_t ArtsPortMatrixEntry::Length(uint8_t version /* = 0 */) const
1912 {
1913 uint32_t length;
1914
1915@@ -193,14 +195,14 @@
1916 //.........................................................................
1917 //
1918 //-------------------------------------------------------------------------
1919-istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version = 0)
1920+istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version /* = 0 */)
1921 {
1922 uint8_t bytesize,
1923 pktsize,
1924 srcsize,
1925 dstsize;
1926
1927- is.read(&this->_descriptor,sizeof(this->_descriptor));
1928+ is.read((char*)&this->_descriptor,sizeof(this->_descriptor));
1929
1930 srcsize = (this->_descriptor & 0x01) + 1;
1931 dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
1932@@ -220,7 +222,7 @@
1933 //.........................................................................
1934 //
1935 //-------------------------------------------------------------------------
1936-int ArtsPortMatrixEntry::read(int fd, uint8_t version = 0)
1937+int ArtsPortMatrixEntry::read(int fd, uint8_t version /* = 0 */)
1938 {
1939 uint8_t bytesize,
1940 pktsize,
1941@@ -273,14 +275,14 @@
1942 //.........................................................................
1943 //
1944 //-------------------------------------------------------------------------
1945-ostream & ArtsPortMatrixEntry::write(ostream & os, uint8_t version = 0) const
1946+ostream & ArtsPortMatrixEntry::write(ostream & os, uint8_t version /* = 0 */) const
1947 {
1948 uint8_t bytesize,
1949 pktsize,
1950 srcsize,
1951 dstsize;
1952
1953- os.write(&this->_descriptor,sizeof(this->_descriptor));
1954+ os.write((char*)&this->_descriptor,sizeof(this->_descriptor));
1955
1956 srcsize = (this->_descriptor & 0x01) + 1;
1957 dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
1958@@ -300,7 +302,7 @@
1959 //.........................................................................
1960 //
1961 //-------------------------------------------------------------------------
1962-int ArtsPortMatrixEntry::write(int fd, uint8_t version = 0) const
1963+int ArtsPortMatrixEntry::write(int fd, uint8_t version /* = 0 */) const
1964 {
1965 uint8_t bytesize,
1966 pktsize,
1967--- arts++-1-1-a9/classes/src/ArtsNetMatrixEntry.cc.orig Sat Nov 16 01:46:42 2002
1968+++ arts++-1-1-a9/classes/src/ArtsNetMatrixEntry.cc Fri Feb 13 15:12:50 2004
1969@@ -53,6 +53,8 @@
1970 #include "ArtsNetMatrixEntry.hh"
1971 #include "ArtsPrimitive.hh"
1972
1973+using namespace std;
1974+
1975 static const string rcsid = "@(#) $Name$ $Id$";
1976
1977 //-------------------------------------------------------------------------
1978@@ -186,7 +188,7 @@
1979 //.........................................................................
1980 //
1981 //-------------------------------------------------------------------------
1982-uint32_t ArtsNetMatrixEntry::Length(uint8_t version = 2) const
1983+uint32_t ArtsNetMatrixEntry::Length(uint8_t version /* = 2 */) const
1984 {
1985 uint32_t length;
1986
1987@@ -203,7 +205,7 @@
1988 //.........................................................................
1989 //
1990 //-------------------------------------------------------------------------
1991-istream& ArtsNetMatrixEntry::read(istream& is, uint8_t version = 2)
1992+istream& ArtsNetMatrixEntry::read(istream& is, uint8_t version /* = 2 */)
1993 {
1994 uint8_t bytesize,
1995 pktsize,
1996@@ -212,7 +214,7 @@
1997 dstsize,
1998 dstmasklen;
1999
2000- is.read(&this->_descriptor,sizeof(this->_descriptor));
2001+ is.read((char*)&this->_descriptor,sizeof(this->_descriptor));
2002 this->_descriptor = ntohs(this->_descriptor);
2003
2004 srcmasklen = ((this->_descriptor >> 5) & 0x1f) + 1;
2005@@ -237,7 +239,7 @@
2006 //.........................................................................
2007 //
2008 //-------------------------------------------------------------------------
2009-int ArtsNetMatrixEntry::read(int fd, uint8_t version = 2)
2010+int ArtsNetMatrixEntry::read(int fd, uint8_t version /* = 2 */)
2011 {
2012 uint8_t bytesize,
2013 pktsize,
2014@@ -298,7 +300,7 @@
2015 //.........................................................................
2016 //
2017 //-------------------------------------------------------------------------
2018-ostream & ArtsNetMatrixEntry::write(ostream & os, uint8_t version = 2) const
2019+ostream & ArtsNetMatrixEntry::write(ostream & os, uint8_t version /* = 2 */) const
2020 {
2021 uint8_t bytesize,
2022 pktsize,
2023@@ -309,7 +311,7 @@
2024 uint16_t tmpDescriptor;
2025
2026 tmpDescriptor = htons(this->_descriptor);
2027- os.write(&tmpDescriptor,sizeof(tmpDescriptor));
2028+ os.write((char*)&tmpDescriptor,sizeof(tmpDescriptor));
2029
2030 srcmasklen = ((this->_descriptor >> 5) & 0x1f) + 1;
2031 srcsize = (srcmasklen + 7) / 8;
2032@@ -333,7 +335,7 @@
2033 //.........................................................................
2034 //
2035 //-------------------------------------------------------------------------
2036-int ArtsNetMatrixEntry::write(int fd, uint8_t version = 2) const
2037+int ArtsNetMatrixEntry::write(int fd, uint8_t version /* = 2 */) const
2038 {
2039 uint8_t bytesize,
2040 pktsize,
2041--- arts++-1-1-a9/classes/src/ArtsNetMatrixData.cc.orig Sat Nov 16 01:46:42 2002
2042+++ arts++-1-1-a9/classes/src/ArtsNetMatrixData.cc Fri Feb 13 15:14:32 2004
2043@@ -46,6 +46,8 @@
2044 #include "ArtsNetMatrixData.hh"
2045 #include "ArtsPrimitive.hh"
2046
2047+using namespace std;
2048+
2049 static const string rcsid = "@(#) $Name$ $Id$";
2050
2051 //----------------------------------------------------------------------------
2052@@ -83,7 +85,7 @@
2053 //.........................................................................
2054 //
2055 //-------------------------------------------------------------------------
2056-istream & ArtsNetMatrixData::read(istream& is, uint8_t version = 2)
2057+istream & ArtsNetMatrixData::read(istream& is, uint8_t version /* = 2 */)
2058 {
2059 uint32_t entryNum;
2060 ArtsNetMatrixEntry netEntry;
2061@@ -108,7 +110,7 @@
2062 //.........................................................................
2063 //
2064 //-------------------------------------------------------------------------
2065-int ArtsNetMatrixData::read(int fd, uint8_t version = 2)
2066+int ArtsNetMatrixData::read(int fd, uint8_t version /* = 2 */)
2067 {
2068 uint32_t entryNum;
2069 ArtsNetMatrixEntry netEntry;
2070@@ -163,7 +165,7 @@
2071 //.........................................................................
2072 //
2073 //-------------------------------------------------------------------------
2074-ostream & ArtsNetMatrixData::write(ostream& os, uint8_t version = 2)
2075+ostream & ArtsNetMatrixData::write(ostream& os, uint8_t version /* = 2 */)
2076 {
2077 uint32_t entryNum;
2078
2079@@ -185,7 +187,7 @@
2080 //.........................................................................
2081 //
2082 //-------------------------------------------------------------------------
2083-int ArtsNetMatrixData::write(int fd, uint8_t version = 2)
2084+int ArtsNetMatrixData::write(int fd, uint8_t version /* = 2 */)
2085 {
2086 uint32_t entryNum;
2087 int rc;
2088@@ -237,7 +239,7 @@
2089 //.........................................................................
2090 //
2091 //-------------------------------------------------------------------------
2092-uint32_t ArtsNetMatrixData::Length(uint8_t version = 2) const
2093+uint32_t ArtsNetMatrixData::Length(uint8_t version /* = 2 */) const
2094 {
2095 uint32_t length = 0;
2096
2097--- arts++-1-1-a9/classes/src/ArtsNetMatrix.cc.orig Sat Nov 16 01:46:42 2002
2098+++ arts++-1-1-a9/classes/src/ArtsNetMatrix.cc Fri Feb 13 15:18:27 2004
2099@@ -45,6 +45,8 @@
2100 #include "Arts.hh"
2101 #include "ArtsNetMatrix.hh"
2102
2103+using namespace std;
2104+
2105 static const string rcsid = "@(#) $Name$ $Id$";
2106
2107 //-------------------------------------------------------------------------
2108--- arts++-1-1-a9/classes/src/ArtsPortTable.cc.orig Sat Nov 16 01:46:42 2002
2109+++ arts++-1-1-a9/classes/src/ArtsPortTable.cc Fri Feb 13 15:45:15 2004
2110@@ -45,6 +45,8 @@
2111 #include "Arts.hh"
2112 #include "ArtsPortTable.hh"
2113
2114+using namespace std;
2115+
2116 static const string rcsid = "@(#) $Name$ $Id$";
2117
2118 //-------------------------------------------------------------------------
2119--- arts++-1-1-a9/classes/src/ArtsNetMatrixAggregatorMap.cc.orig Sat Nov 16 01:46:42 2002
2120+++ arts++-1-1-a9/classes/src/ArtsNetMatrixAggregatorMap.cc Fri Feb 13 15:25:12 2004
2121@@ -53,6 +53,9 @@
2122
2123 #include "ArtsNetMatrixAggregatorMap.hh"
2124
2125+#include <iterator>
2126+using namespace std;
2127+
2128 static const string rcsid = "@(#) $Name$ $Id$";
2129
2130 //-------------------------------------------------------------------------
2131--- arts++-1-1-a9/classes/src/ArtsNextHopTableEntry.cc.orig Sat Nov 16 01:46:42 2002
2132+++ arts++-1-1-a9/classes/src/ArtsNextHopTableEntry.cc Fri Feb 13 15:26:48 2004
2133@@ -54,6 +54,8 @@
2134 #include "ArtsPrimitive.hh"
2135 #include "ArtsNextHopTableEntry.hh"
2136
2137+using namespace std;
2138+
2139 static const string rcsid = "@(#) $Name$ $Id$";
2140
2141 //-------------------------------------------------------------------------
2142@@ -192,7 +194,7 @@
2143 //-------------------------------------------------------------------------
2144 // uint32_t ArtsNextHopTableEntry::Length(uint8_t version = 0) const
2145 //-------------------------------------------------------------------------
2146-uint32_t ArtsNextHopTableEntry::Length(uint8_t version = 0) const
2147+uint32_t ArtsNextHopTableEntry::Length(uint8_t version /* = 0 */) const
2148 {
2149 uint32_t len = 0;
2150
2151@@ -207,15 +209,15 @@
2152 //-------------------------------------------------------------------------
2153 // istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version = 0)
2154 //-------------------------------------------------------------------------
2155-istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version = 0)
2156+istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version /* = 0 */)
2157 {
2158 uint8_t fieldLen;
2159
2160 // IP address
2161- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
2162+ is.read((char*)&this->_ipAddr,sizeof(this->_ipAddr));
2163
2164 // descriptor
2165- is.read(&this->_descriptor,sizeof(this->_descriptor));
2166+ is.read((char*)&this->_descriptor,sizeof(this->_descriptor));
2167
2168 // pkts
2169 fieldLen = (this->_descriptor >> 3) + 1;
2170@@ -231,7 +233,7 @@
2171 //-------------------------------------------------------------------------
2172 // int ArtsNextHopTableEntry::read(int fd, uint8_t version = 0)
2173 //-------------------------------------------------------------------------
2174-int ArtsNextHopTableEntry::read(int fd, uint8_t version = 0)
2175+int ArtsNextHopTableEntry::read(int fd, uint8_t version /* = 0 */)
2176 {
2177 uint8_t fieldLen;
2178 int rc = 0;
2179@@ -262,15 +264,15 @@
2180 // uint8_t version = 0) const
2181 //-------------------------------------------------------------------------
2182 ostream& ArtsNextHopTableEntry::write(ostream& os,
2183- uint8_t version = 0) const
2184+ uint8_t version /* = 0 */) const
2185 {
2186 uint8_t fieldLen;
2187
2188 // IP address
2189- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
2190+ os.write((char*)&this->_ipAddr,sizeof(this->_ipAddr));
2191
2192 // descriptor
2193- os.write(&this->_descriptor,1);
2194+ os.write((char*)&this->_descriptor,1);
2195
2196 // pkts
2197 fieldLen = (this->_descriptor >> 3) + 1;
2198@@ -286,7 +288,7 @@
2199 //-------------------------------------------------------------------------
2200 // int ArtsNextHopTableEntry::write(int fd, uint8_t version = 0) const
2201 //-------------------------------------------------------------------------
2202-int ArtsNextHopTableEntry::write(int fd, uint8_t version = 0) const
2203+int ArtsNextHopTableEntry::write(int fd, uint8_t version /* = 0 */) const
2204 {
2205 uint8_t fieldLen;
2206 int rc = 0;
2207--- arts++-1-1-a9/classes/src/ArtsPortMatrixData.cc.orig Sat Nov 16 01:46:42 2002
2208+++ arts++-1-1-a9/classes/src/ArtsPortMatrixData.cc Fri Feb 13 15:41:46 2004
2209@@ -44,6 +44,8 @@
2210 #include "ArtsPortMatrixData.hh"
2211 #include "ArtsPrimitive.hh"
2212
2213+using namespace std;
2214+
2215 static const string rcsid = "@(#) $Name$ $Id$";
2216
2217
2218@@ -82,7 +84,7 @@
2219 //.........................................................................
2220 //
2221 //-------------------------------------------------------------------------
2222-istream & ArtsPortMatrixData::read(istream& is, uint8_t version = 0)
2223+istream & ArtsPortMatrixData::read(istream& is, uint8_t version /* = 0 */)
2224 {
2225 uint32_t entryNum;
2226 ArtsPortMatrixEntry portEntry;
2227@@ -107,7 +109,7 @@
2228 //.........................................................................
2229 //
2230 //-------------------------------------------------------------------------
2231-int ArtsPortMatrixData::read(int fd, uint8_t version = 0)
2232+int ArtsPortMatrixData::read(int fd, uint8_t version /* = 0 */)
2233 {
2234 uint32_t entryNum;
2235 ArtsPortMatrixEntry portEntry;
2236@@ -162,7 +164,7 @@
2237 //.........................................................................
2238 //
2239 //-------------------------------------------------------------------------
2240-ostream & ArtsPortMatrixData::write(ostream& os, uint8_t version = 0)
2241+ostream & ArtsPortMatrixData::write(ostream& os, uint8_t version /* = 0 */)
2242 {
2243 uint32_t entryNum;
2244
2245@@ -184,7 +186,7 @@
2246 //.........................................................................
2247 //
2248 //-------------------------------------------------------------------------
2249-int ArtsPortMatrixData::write(int fd, uint8_t version = 0)
2250+int ArtsPortMatrixData::write(int fd, uint8_t version /* = 0 */)
2251 {
2252 uint32_t entryNum;
2253 int rc;
2254@@ -236,7 +238,7 @@
2255 //.........................................................................
2256 //
2257 //-------------------------------------------------------------------------
2258-uint32_t ArtsPortMatrixData::Length(uint8_t version = 0) const
2259+uint32_t ArtsPortMatrixData::Length(uint8_t version /* = 0 */) const
2260 {
2261 uint32_t length = 0;
2262
2263--- arts++-1-1-a9/classes/src/ArtsNextHopTableData.cc.orig Sat Nov 16 01:46:42 2002
2264+++ arts++-1-1-a9/classes/src/ArtsNextHopTableData.cc Fri Feb 13 15:28:26 2004
2265@@ -182,7 +182,7 @@
2266 //.........................................................................
2267 //
2268 //-------------------------------------------------------------------------
2269-uint32_t ArtsNextHopTableData::ComputeLength(uint8_t version = 0) const
2270+uint32_t ArtsNextHopTableData::ComputeLength(uint8_t version /* = 0 */) const
2271 {
2272 this->_length = 0;
2273
2274@@ -205,7 +205,7 @@
2275 //.........................................................................
2276 //
2277 //-------------------------------------------------------------------------
2278-uint32_t ArtsNextHopTableData::Length(uint8_t version = 0) const
2279+uint32_t ArtsNextHopTableData::Length(uint8_t version /* = 0 */) const
2280 {
2281 this->ComputeLength(version);
2282 return(this->_length);
2283@@ -216,7 +216,7 @@
2284 //.........................................................................
2285 //
2286 //-------------------------------------------------------------------------
2287-istream& ArtsNextHopTableData::read(istream& is, uint8_t version = 0)
2288+istream& ArtsNextHopTableData::read(istream& is, uint8_t version /* = 0 */)
2289 {
2290 uint32_t numNextHops;
2291 uint32_t NextHopNum;
2292@@ -239,7 +239,7 @@
2293 //.........................................................................
2294 //
2295 //-------------------------------------------------------------------------
2296-int ArtsNextHopTableData::read(int fd, uint8_t version = 0)
2297+int ArtsNextHopTableData::read(int fd, uint8_t version /* = 0 */)
2298 {
2299 uint32_t numNextHops;
2300 uint32_t NextHopNum;
2301@@ -281,7 +281,7 @@
2302 //
2303 //-------------------------------------------------------------------------
2304 ostream& ArtsNextHopTableData::write(ostream& os,
2305- uint8_t version = 0) const
2306+ uint8_t version /* = 0 */) const
2307 {
2308 uint32_t numNextHops;
2309
2310@@ -306,7 +306,7 @@
2311 //.........................................................................
2312 //
2313 //-------------------------------------------------------------------------
2314-int ArtsNextHopTableData::write(int fd, uint8_t version = 0) const
2315+int ArtsNextHopTableData::write(int fd, uint8_t version /* = 0 */) const
2316 {
2317 uint32_t numNextHops;
2318 int rc;
2319--- arts++-1-1-a9/classes/src/ArtsNextHopTable.cc.orig Sat Nov 16 01:46:42 2002
2320+++ arts++-1-1-a9/classes/src/ArtsNextHopTable.cc Fri Feb 13 15:28:54 2004
2321@@ -45,6 +45,8 @@
2322 #include "Arts.hh"
2323 #include "ArtsNextHopTable.hh"
2324
2325+using namespace std;
2326+
2327 static const string rcsid = "@(#) $Name$ $Id$";
2328
2329 //-------------------------------------------------------------------------
2330--- arts++-1-1-a9/classes/src/ArtsObjectTypeSelectionSet.lex.orig Sat Nov 16 01:46:42 2002
2331+++ arts++-1-1-a9/classes/src/ArtsObjectTypeSelectionSet.lex Fri Feb 13 15:31:23 2004
2332@@ -56,6 +56,8 @@
2333 #include "ArtsHeader.hh"
2334 #include "ArtsObjectTypeSelectionSet.hh"
2335
2336+using namespace std;
2337+
2338 static const string rcsid = "@(#) $Name$ $Id$";
2339 %}
2340
2341--- arts++-1-1-a9/classes/src/ArtsPortMatrixAggregator.cc.orig Sat Nov 16 01:46:42 2002
2342+++ arts++-1-1-a9/classes/src/ArtsPortMatrixAggregator.cc Fri Feb 13 15:36:17 2004
2343@@ -327,7 +327,7 @@
2344 //----------------------------------------------------------------------------
2345 ArtsSelectedPortTable *
2346 ArtsPortMatrixAggregator::
2347-ConvertToArtsSelectedPortTable(int numTopPorts, bool byPkts = false) const
2348+ConvertToArtsSelectedPortTable(int numTopPorts, bool byPkts /* = false */) const
2349 {
2350 ArtsPortTableEntry portEntry;
2351 map<ArtsPortMatrixKeyValue,counter_t,less<ArtsPortMatrixKeyValue> >::const_iterator portCounter;
2352--- arts++-1-1-a9/classes/src/ArtsPortMatrixAggregatorMap.cc.orig Sat Nov 16 01:46:42 2002
2353+++ arts++-1-1-a9/classes/src/ArtsPortMatrixAggregatorMap.cc Fri Feb 13 15:37:29 2004
2354@@ -53,6 +53,9 @@
2355
2356 #include "ArtsPortMatrixAggregatorMap.hh"
2357
2358+#include <iterator>
2359+using namespace std;
2360+
2361 static const string rcsid = "@(#) $Name$ $Id$";
2362
2363 //-------------------------------------------------------------------------
2364--- arts++-1-1-a9/classes/src/ArtsPortMatrix.cc.orig Sat Nov 16 01:46:42 2002
2365+++ arts++-1-1-a9/classes/src/ArtsPortMatrix.cc Fri Feb 13 15:42:11 2004
2366@@ -45,6 +45,8 @@
2367 #include "Arts.hh"
2368 #include "ArtsPortMatrix.hh"
2369
2370+using namespace std;
2371+
2372 static const string rcsid = "@(#) $Name$ $Id$";
2373
2374 //-------------------------------------------------------------------------
2375--- arts++-1-1-a9/classes/src/ArtsPortTableEntry.cc.orig Sat Nov 16 01:46:42 2002
2376+++ arts++-1-1-a9/classes/src/ArtsPortTableEntry.cc Fri Feb 13 15:43:43 2004
2377@@ -51,6 +51,8 @@
2378 #include "ArtsPrimitive.hh"
2379 #include "ArtsPortTableEntry.hh"
2380
2381+using namespace std;
2382+
2383 static const string rcsid = "@(#) $Name$ $Id$";
2384
2385 //-------------------------------------------------------------------------
2386@@ -332,7 +334,7 @@
2387 //-------------------------------------------------------------------------
2388 // uint32_t ArtsPortTableEntry::Length(uint8_t version = 0) const
2389 //-------------------------------------------------------------------------
2390-uint32_t ArtsPortTableEntry::Length(uint8_t version = 0) const
2391+uint32_t ArtsPortTableEntry::Length(uint8_t version /* = 0 */) const
2392 {
2393 uint32_t len = 0;
2394
2395@@ -349,7 +351,7 @@
2396 //-------------------------------------------------------------------------
2397 // istream& ArtsPortTableEntry::read(istream& is, uint8_t version = 0)
2398 //-------------------------------------------------------------------------
2399-istream& ArtsPortTableEntry::read(istream& is, uint8_t version = 0)
2400+istream& ArtsPortTableEntry::read(istream& is, uint8_t version /* = 0 */)
2401 {
2402 uint8_t fieldLen;
2403
2404@@ -358,7 +360,7 @@
2405 sizeof(this->_portNum));
2406
2407 // descriptor
2408- is.read(&this->_descriptor,sizeof(this->_descriptor));
2409+ is.read((char*)&this->_descriptor,sizeof(this->_descriptor));
2410
2411 // inPkts
2412 fieldLen = 1 << (this->_descriptor >> 6);
2413@@ -382,7 +384,7 @@
2414 //-------------------------------------------------------------------------
2415 // int ArtsPortTableEntry::read(int fd, uint8_t version = 0)
2416 //-------------------------------------------------------------------------
2417-int ArtsPortTableEntry::read(int fd, uint8_t version = 0)
2418+int ArtsPortTableEntry::read(int fd, uint8_t version /* = 0 */)
2419 {
2420 uint8_t fieldLen;
2421 int rc = 0;
2422@@ -421,7 +423,7 @@
2423 // uint8_t version = 0) const
2424 //-------------------------------------------------------------------------
2425 ostream& ArtsPortTableEntry::write(ostream& os,
2426- uint8_t version = 0) const
2427+ uint8_t version /* = 0 */) const
2428 {
2429 uint8_t fieldLen;
2430
2431@@ -430,7 +432,7 @@
2432 sizeof(this->_portNum));
2433
2434 // descriptor
2435- os.write(&this->_descriptor,1);
2436+ os.write((char*)&this->_descriptor,1);
2437
2438 // inPkts
2439 fieldLen = 1 << (this->_descriptor >> 6);
2440@@ -454,7 +456,7 @@
2441 //-------------------------------------------------------------------------
2442 // int ArtsPortTableEntry::write(int fd, uint8_t version = 0) const
2443 //-------------------------------------------------------------------------
2444-int ArtsPortTableEntry::write(int fd, uint8_t version = 0) const
2445+int ArtsPortTableEntry::write(int fd, uint8_t version /* = 0 */) const
2446 {
2447 uint8_t fieldLen;
2448 int rc = 0;
2449--- arts++-1-1-a9/classes/src/ArtsPortTableData.cc.orig Sat Nov 16 01:46:42 2002
2450+++ arts++-1-1-a9/classes/src/ArtsPortTableData.cc Fri Feb 13 15:44:48 2004
2451@@ -182,7 +182,7 @@
2452 //.........................................................................
2453 //
2454 //-------------------------------------------------------------------------
2455-uint32_t ArtsPortTableData::ComputeLength(uint8_t version = 0) const
2456+uint32_t ArtsPortTableData::ComputeLength(uint8_t version /* = 0 */) const
2457 {
2458 this->_length = 0;
2459
2460@@ -205,7 +205,7 @@
2461 //.........................................................................
2462 //
2463 //-------------------------------------------------------------------------
2464-uint32_t ArtsPortTableData::Length(uint8_t version = 0) const
2465+uint32_t ArtsPortTableData::Length(uint8_t version /* = 0 */) const
2466 {
2467 this->ComputeLength(version);
2468 return(this->_length);
2469@@ -216,7 +216,7 @@
2470 //.........................................................................
2471 //
2472 //-------------------------------------------------------------------------
2473-istream& ArtsPortTableData::read(istream& is, uint8_t version = 0)
2474+istream& ArtsPortTableData::read(istream& is, uint8_t version /* = 0 */)
2475 {
2476 uint32_t numPorts;
2477 uint32_t portNum;
2478@@ -239,7 +239,7 @@
2479 //.........................................................................
2480 //
2481 //-------------------------------------------------------------------------
2482-int ArtsPortTableData::read(int fd, uint8_t version = 0)
2483+int ArtsPortTableData::read(int fd, uint8_t version /* = 0 */)
2484 {
2485 uint32_t numPorts;
2486 uint32_t portNum;
2487@@ -281,7 +281,7 @@
2488 //
2489 //-------------------------------------------------------------------------
2490 ostream& ArtsPortTableData::write(ostream& os,
2491- uint8_t version = 0) const
2492+ uint8_t version /* = 0 */) const
2493 {
2494 uint32_t numPorts;
2495 vector<ArtsPortTableEntry>::const_iterator portEntry;
2496@@ -305,7 +305,7 @@
2497 //.........................................................................
2498 //
2499 //-------------------------------------------------------------------------
2500-int ArtsPortTableData::write(int fd, uint8_t version = 0) const
2501+int ArtsPortTableData::write(int fd, uint8_t version /* = 0 */) const
2502 {
2503 uint32_t numPorts;
2504 int rc;
2505--- arts++-1-1-a9/classes/src/ArtsProtocolTableEntry.cc.orig Sat Nov 16 01:46:42 2002
2506+++ arts++-1-1-a9/classes/src/ArtsProtocolTableEntry.cc Fri Feb 13 15:48:08 2004
2507@@ -51,6 +51,8 @@
2508 #include "ArtsPrimitive.hh"
2509 #include "ArtsProtocolTableEntry.hh"
2510
2511+using namespace std;
2512+
2513 static const string rcsid = "@(#) $Name$ $Id$";
2514
2515 //-------------------------------------------------------------------------
2516@@ -189,7 +191,7 @@
2517 //-------------------------------------------------------------------------
2518 // uint32_t ArtsProtocolTableEntry::Length(uint8_t version = 0) const
2519 //-------------------------------------------------------------------------
2520-uint32_t ArtsProtocolTableEntry::Length(uint8_t version = 0) const
2521+uint32_t ArtsProtocolTableEntry::Length(uint8_t version /* = 0 */) const
2522 {
2523 uint32_t len = 0;
2524
2525@@ -204,15 +206,15 @@
2526 //-------------------------------------------------------------------------
2527 // istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version = 0)
2528 //-------------------------------------------------------------------------
2529-istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version = 0)
2530+istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version /* = 0 */)
2531 {
2532 uint8_t fieldLen;
2533
2534 // protocol number
2535- is.read(&this->_protocolNum,sizeof(this->_protocolNum));
2536+ is.read((char*)&this->_protocolNum,sizeof(this->_protocolNum));
2537
2538 // descriptor
2539- is.read(&this->_descriptor,sizeof(this->_descriptor));
2540+ is.read((char*)&this->_descriptor,sizeof(this->_descriptor));
2541
2542 // pkts
2543 fieldLen = (this->_descriptor >> 3) + 1;
2544@@ -228,7 +230,7 @@
2545 //-------------------------------------------------------------------------
2546 // int ArtsProtocolTableEntry::read(int fd, uint8_t version = 0)
2547 //-------------------------------------------------------------------------
2548-int ArtsProtocolTableEntry::read(int fd, uint8_t version = 0)
2549+int ArtsProtocolTableEntry::read(int fd, uint8_t version /* = 0 */)
2550 {
2551 uint8_t fieldLen;
2552 int rc = 0;
2553@@ -259,15 +261,15 @@
2554 // uint8_t version = 0) const
2555 //-------------------------------------------------------------------------
2556 ostream& ArtsProtocolTableEntry::write(ostream& os,
2557- uint8_t version = 0) const
2558+ uint8_t version /* = 0 */) const
2559 {
2560 uint8_t fieldLen;
2561
2562 // protocol number
2563- os.write(&this->_protocolNum,sizeof(this->_protocolNum));
2564+ os.write((char*)&this->_protocolNum,sizeof(this->_protocolNum));
2565
2566 // descriptor
2567- os.write(&this->_descriptor,1);
2568+ os.write((char*)&this->_descriptor,1);
2569
2570 // pkts
2571 fieldLen = (this->_descriptor >> 3) + 1;
2572@@ -283,7 +285,7 @@
2573 //-------------------------------------------------------------------------
2574 // int ArtsProtocolTableEntry::write(int fd, uint8_t version = 0) const
2575 //-------------------------------------------------------------------------
2576-int ArtsProtocolTableEntry::write(int fd, uint8_t version = 0) const
2577+int ArtsProtocolTableEntry::write(int fd, uint8_t version /* = 0 */) const
2578 {
2579 uint8_t fieldLen;
2580 int rc = 0;
2581--- arts++-1-1-a9/classes/src/ArtsProtocolTableData.cc.orig Sat Nov 16 01:46:42 2002
2582+++ arts++-1-1-a9/classes/src/ArtsProtocolTableData.cc Fri Feb 13 15:49:15 2004
2583@@ -182,7 +182,7 @@
2584 //.........................................................................
2585 //
2586 //-------------------------------------------------------------------------
2587-uint32_t ArtsProtocolTableData::ComputeLength(uint8_t version = 0) const
2588+uint32_t ArtsProtocolTableData::ComputeLength(uint8_t version /* = 0 */) const
2589 {
2590 this->_length = 0;
2591
2592@@ -205,7 +205,7 @@
2593 //.........................................................................
2594 //
2595 //-------------------------------------------------------------------------
2596-uint32_t ArtsProtocolTableData::Length(uint8_t version = 0) const
2597+uint32_t ArtsProtocolTableData::Length(uint8_t version /* = 0 */) const
2598 {
2599 this->ComputeLength(version);
2600 return(this->_length);
2601@@ -216,7 +216,7 @@
2602 //.........................................................................
2603 //
2604 //-------------------------------------------------------------------------
2605-istream& ArtsProtocolTableData::read(istream& is, uint8_t version = 0)
2606+istream& ArtsProtocolTableData::read(istream& is, uint8_t version /* = 0 */)
2607 {
2608 uint32_t numProtocols;
2609 uint32_t protocolNum;
2610@@ -239,7 +239,7 @@
2611 //.........................................................................
2612 //
2613 //-------------------------------------------------------------------------
2614-int ArtsProtocolTableData::read(int fd, uint8_t version = 0)
2615+int ArtsProtocolTableData::read(int fd, uint8_t version /* = 0 */)
2616 {
2617 uint32_t numProtocols;
2618 uint32_t protocolNum;
2619@@ -281,7 +281,7 @@
2620 //
2621 //-------------------------------------------------------------------------
2622 ostream& ArtsProtocolTableData::write(ostream& os,
2623- uint8_t version = 0) const
2624+ uint8_t version /* = 0 */) const
2625 {
2626 uint32_t numProtocols;
2627
2628@@ -306,7 +306,7 @@
2629 //.........................................................................
2630 //
2631 //-------------------------------------------------------------------------
2632-int ArtsProtocolTableData::write(int fd, uint8_t version = 0) const
2633+int ArtsProtocolTableData::write(int fd, uint8_t version /* = 0 */) const
2634 {
2635 uint32_t numProtocols;
2636 int rc;
2637--- arts++-1-1-a9/classes/src/ArtsProtocolTable.cc.orig Sat Nov 16 01:46:42 2002
2638+++ arts++-1-1-a9/classes/src/ArtsProtocolTable.cc Fri Feb 13 15:49:39 2004
2639@@ -45,6 +45,8 @@
2640 #include "Arts.hh"
2641 #include "ArtsProtocolTable.hh"
2642
2643+using namespace std;
2644+
2645 static const string rcsid = "@(#) $Name$ $Id$";
2646
2647 //-------------------------------------------------------------------------
2648--- arts++-1-1-a9/classes/src/ArtsProtocolTableAggregatorMap.cc.orig Sat Nov 16 01:46:42 2002
2649+++ arts++-1-1-a9/classes/src/ArtsProtocolTableAggregatorMap.cc Fri Feb 13 15:50:26 2004
2650@@ -53,6 +53,9 @@
2651
2652 #include "ArtsProtocolTableAggregatorMap.hh"
2653
2654+#include <iterator>
2655+using namespace std;
2656+
2657 static const string rcsid = "@(#) $Name$ $Id$";
2658
2659 //-------------------------------------------------------------------------
2660--- arts++-1-1-a9/classes/src/ArtsPrimitive.cc.orig Sat Nov 16 01:46:42 2002
2661+++ arts++-1-1-a9/classes/src/ArtsPrimitive.cc Fri Feb 13 15:55:08 2004
2662@@ -69,6 +69,8 @@
2663
2664 #include "ArtsPrimitive.hh"
2665
2666+using namespace std;
2667+
2668 static const string rcsid = "@(#) $Name$ $Id$";
2669
2670 //-------------------------------------------------------------------------
2671@@ -150,11 +152,11 @@
2672 switch (len) {
2673 case 1:
2674 val8 = value;
2675- os.write(&val8,sizeof(val8));
2676+ os.write((char*)&val8,sizeof(val8));
2677 break;
2678 case 2:
2679 val16 = htons(value);
2680- os.write(&val16,sizeof(val16));
2681+ os.write((char*)&val16,sizeof(val16));
2682 break;
2683 default:
2684 #ifdef ARTS_DEBUG_DO_ASSERTIONS
2685@@ -218,11 +220,11 @@
2686
2687 switch (len) {
2688 case 1:
2689- is.read(&val8,sizeof(val8));
2690+ is.read((char*)&val8,sizeof(val8));
2691 value = val8;
2692 break;
2693 case 2:
2694- is.read(&val16,sizeof(val16));
2695+ is.read((char*)&val16,sizeof(val16));
2696 value = ntohs(val16);
2697 break;
2698 default:
2699@@ -289,23 +291,23 @@
2700 switch (len) {
2701 case 1:
2702 val8 = value;
2703- os.write(&val8,sizeof(val8));
2704+ os.write((char*)&val8,sizeof(val8));
2705 break;
2706 case 2:
2707 val16 = value;
2708 val16 = htons(val16);
2709- os.write(&val16,sizeof(val16));
2710+ os.write((char*)&val16,sizeof(val16));
2711 break;
2712 case 3:
2713 val8 = (value >> 16);
2714- os.write(&val8,sizeof(val8));
2715+ os.write((char*)&val8,sizeof(val8));
2716 val16 = htons((value & 0x0000ffff));
2717- os.write(&val16,sizeof(val16));
2718+ os.write((char*)&val16,sizeof(val16));
2719 break;
2720 case 4:
2721 val32 = value;
2722 val32 = htonl(value);
2723- os.write(&val32,sizeof(val32));
2724+ os.write((char*)&val32,sizeof(val32));
2725 break;
2726 default:
2727 #ifdef ARTS_DEBUG_DO_ASSERTIONS
2728@@ -384,21 +386,21 @@
2729
2730 switch (len) {
2731 case 1:
2732- is.read(&val8,sizeof(val8));
2733+ is.read((char*)&val8,sizeof(val8));
2734 value = val8;
2735 break;
2736 case 2:
2737- is.read(&val16,sizeof(val16));
2738+ is.read((char*)&val16,sizeof(val16));
2739 value = ntohs(val16);
2740 break;
2741 case 3:
2742- is.read(&val8,sizeof(val8));
2743+ is.read((char*)&val8,sizeof(val8));
2744 value = ((uint32_t)val8) << 16;
2745- is.read(&val16,sizeof(val16));
2746+ is.read((char*)&val16,sizeof(val16));
2747 value |= ntohs(val16);
2748 break;
2749 case 4:
2750- is.read(&val32,sizeof(val32));
2751+ is.read((char*)&val32,sizeof(val32));
2752 value = ntohl(val32);
2753 break;
2754 default:
2755@@ -483,22 +485,22 @@
2756 switch (len) {
2757 case 1:
2758 val8 = value;
2759- os.write(&val8,sizeof(val8));
2760+ os.write((char*)&val8,sizeof(val8));
2761 break;
2762 case 2:
2763 val16 = value;
2764 val16 = htons(val16);
2765- os.write(&val16,sizeof(val16));
2766+ os.write((char*)&val16,sizeof(val16));
2767 break;
2768 case 4:
2769 valuePart[0] = value;
2770 valuePart[0] = htonl(value);
2771- os.write(&valuePart[0],sizeof(uint32_t));
2772+ os.write((char*)&valuePart[0],sizeof(uint32_t));
2773 break;
2774 case 8:
2775 valuePart[0] = htonl(value >> 32);
2776 valuePart[1] = htonl(value & 0xffffffff);
2777- os.write(valuePart,sizeof(valuePart));
2778+ os.write((char*)valuePart,sizeof(valuePart));
2779 break;
2780 default:
2781 #ifdef ARTS_DEBUG_DO_ASSERTIONS
2782@@ -575,19 +577,19 @@
2783
2784 switch (len) {
2785 case 1:
2786- is.read(&val8,sizeof(val8));
2787+ is.read((char*)&val8,sizeof(val8));
2788 value = val8;
2789 break;
2790 case 2:
2791- is.read(&val16,sizeof(val16));
2792+ is.read((char*)&val16,sizeof(val16));
2793 value = ntohs(val16);
2794 break;
2795 case 4:
2796- is.read(&valuePart[0],sizeof(uint32_t));
2797+ is.read((char*)&valuePart[0],sizeof(uint32_t));
2798 value = ntohl(valuePart[0]);
2799 break;
2800 case 8:
2801- is.read(valuePart,sizeof(valuePart));
2802+ is.read((char*)valuePart,sizeof(valuePart));
2803 value = ((uint64_t)ntohl(valuePart[0])) << 32;
2804 value += ntohl(valuePart[1]);
2805 break;
2806@@ -667,24 +669,24 @@
2807
2808 switch (len) {
2809 case 1:
2810- is.read(&octet1,sizeof(octet1));
2811+ is.read((char*)&octet1,sizeof(octet1));
2812 value = htonl((ipv4addr_t)octet1 << 24);
2813 break;
2814 case 2:
2815- is.read(&octet1,sizeof(octet1));
2816- is.read(&octet2,sizeof(octet2));
2817+ is.read((char*)&octet1,sizeof(octet1));
2818+ is.read((char*)&octet2,sizeof(octet2));
2819 value = htonl(((ipv4addr_t)octet1 << 24) | ((ipv4addr_t)octet2 << 16));
2820 break;
2821 case 3:
2822- is.read(&octet1,sizeof(octet1));
2823- is.read(&octet2,sizeof(octet2));
2824- is.read(&octet3,sizeof(octet3));
2825+ is.read((char*)&octet1,sizeof(octet1));
2826+ is.read((char*)&octet2,sizeof(octet2));
2827+ is.read((char*)&octet3,sizeof(octet3));
2828 value = htonl(((ipv4addr_t)octet1 << 24) |
2829 ((ipv4addr_t)octet2 << 16) |
2830 ((ipv4addr_t)octet3 << 8));
2831 break;
2832 case 4:
2833- is.read(&ipAddr,sizeof(ipAddr));
2834+ is.read((char*)&ipAddr,sizeof(ipAddr));
2835 value = ipAddr;
2836 break;
2837 default:
2838@@ -766,26 +768,26 @@
2839 switch (len) {
2840 case 1:
2841 octet1 = ntohl(value) >> 24;
2842- os.write(&octet1,sizeof(octet1));
2843+ os.write((char*)&octet1,sizeof(octet1));
2844 break;
2845 case 2:
2846 netaddr = ntohl(value);
2847 octet1 = (ipv4addr_t)(netaddr >> 24) & 0xff;
2848 octet2 = (ipv4addr_t)(netaddr >> 16) & 0xff;
2849- os.write(&octet1,sizeof(octet1));
2850- os.write(&octet2,sizeof(octet2));
2851+ os.write((char*)&octet1,sizeof(octet1));
2852+ os.write((char*)&octet2,sizeof(octet2));
2853 break;
2854 case 3:
2855 netaddr = ntohl(value);
2856 octet1 = (ipv4addr_t)(netaddr >> 24) & 0xff;
2857 octet2 = (ipv4addr_t)(netaddr >> 16) & 0xff;
2858 octet3 = (ipv4addr_t)(netaddr >> 8) & 0xff;
2859- os.write(&octet1,sizeof(octet1));
2860- os.write(&octet2,sizeof(octet2));
2861- os.write(&octet3,sizeof(octet3));
2862+ os.write((char*)&octet1,sizeof(octet1));
2863+ os.write((char*)&octet2,sizeof(octet2));
2864+ os.write((char*)&octet3,sizeof(octet3));
2865 break;
2866 case 4:
2867- os.write(&value,4);
2868+ os.write((char*)&value,4);
2869 break;
2870 default:
2871 #ifdef ARTS_DEBUG_DO_ASSERTIONS
2872--- arts++-1-1-a9/classes/src/ArtsRttTimeSeriesTableData.cc.orig Sat Nov 16 01:46:42 2002
2873+++ arts++-1-1-a9/classes/src/ArtsRttTimeSeriesTableData.cc Fri Feb 13 16:02:52 2004
2874@@ -61,6 +61,9 @@
2875 #include "ArtsRttTimeSeriesTableData.hh"
2876 #include "ArtsPrimitive.hh"
2877
2878+#include <cassert>
2879+using namespace std;
2880+
2881 static const string rcsid = "@(#) $Name$ $Id$";
2882
2883 //----------------------------------------------------------------------------
2884@@ -192,7 +195,7 @@
2885 ostream & ArtsRttTimeSeriesTableEntry::write(ostream & os,
2886 uint32_t timeBase,
2887 uint32_t prevSecsOffset,
2888- uint8_t version = 0) const
2889+ uint8_t version /* = 0 */) const
2890 {
2891 uint8_t rleFlags = 0;
2892 uint8_t timestampSecsLength = 0;
2893@@ -217,7 +220,7 @@
2894
2895 timestampUsecsLength = BytesNeededForUint32(this->_timestamp.tv_usec);
2896 rleFlags |= (timestampUsecsLength - 1);
2897- os.write(&rleFlags,sizeof(rleFlags));
2898+ os.write((char*)&rleFlags,sizeof(rleFlags));
2899 if (rttLength > 0)
2900 g_ArtsLibInternal_Primitive.WriteUint32(os,this->_rtt,rttLength);
2901 if (timestampSecsLength > 0)
2902@@ -239,7 +242,7 @@
2903 int ArtsRttTimeSeriesTableEntry::write(int fd,
2904 uint32_t timeBase,
2905 uint32_t prevSecsOffset,
2906- uint8_t version = 0) const
2907+ uint8_t version /* = 0 */) const
2908 {
2909 uint8_t rleFlags = 0;
2910 uint8_t timestampSecsLength = 0;
2911@@ -302,7 +305,7 @@
2912 //----------------------------------------------------------------------------
2913 uint32_t ArtsRttTimeSeriesTableEntry::Length(uint32_t timeBase,
2914 uint32_t prevSecsOffset,
2915- uint8_t version = 0) const
2916+ uint8_t version /* = 0 */) const
2917 {
2918 uint32_t length = sizeof(uint8_t); // always have rleFlags
2919 if (this->_rtt != k_droppedPacketRtt) {
2920@@ -330,13 +333,13 @@
2921 istream & ArtsRttTimeSeriesTableEntry::read(istream & is,
2922 uint32_t timeBase,
2923 uint32_t prevSecsOffset,
2924- uint8_t version = 0)
2925+ uint8_t version /* = 0 */)
2926 {
2927 uint8_t rleFlags = 0;
2928 uint8_t timestampUsecsLength = 0;
2929 uint32_t timeVal;
2930
2931- is.read(&rleFlags,sizeof(rleFlags));
2932+ is.read((char*)&rleFlags,sizeof(rleFlags));
2933
2934 if (rleFlags & 0x80) {
2935 // it's a dropped packet; RTT length is 0
2936@@ -374,7 +377,7 @@
2937 //----------------------------------------------------------------------------
2938 int ArtsRttTimeSeriesTableEntry::read(int fd, uint32_t timeBase,
2939 uint32_t prevSecsOffset,
2940- uint8_t version = 0)
2941+ uint8_t version /* = 0 */)
2942 {
2943 uint8_t rleFlags = 0;
2944 uint8_t timestampUsecsLength = 0;
2945@@ -594,7 +597,7 @@
2946 //............................................................................
2947 //
2948 //----------------------------------------------------------------------------
2949-istream & ArtsRttTimeSeriesTableData::read(istream& is, uint8_t version = 0)
2950+istream & ArtsRttTimeSeriesTableData::read(istream& is, uint8_t version /* = 0 */)
2951 {
2952 uint32_t numRttEntries, rttEntryNum;
2953 ArtsRttTimeSeriesTableEntry rttEntry;
2954@@ -623,7 +626,7 @@
2955 //............................................................................
2956 //
2957 //----------------------------------------------------------------------------
2958-int ArtsRttTimeSeriesTableData::read(int fd, uint8_t version = 0)
2959+int ArtsRttTimeSeriesTableData::read(int fd, uint8_t version /* = 0 */)
2960 {
2961 uint32_t numRttEntries, rttEntryNum;
2962 ArtsRttTimeSeriesTableEntry rttEntry;
2963@@ -664,7 +667,7 @@
2964 //............................................................................
2965 //
2966 //----------------------------------------------------------------------------
2967-uint32_t ArtsRttTimeSeriesTableData::Length(uint8_t version = 0) const
2968+uint32_t ArtsRttTimeSeriesTableData::Length(uint8_t version /* = 0 */) const
2969 {
2970 uint32_t length = 0;
2971 uint32_t rttEntryNum, numRttEntries;
2972@@ -693,7 +696,7 @@
2973 //
2974 //----------------------------------------------------------------------------
2975 ostream & ArtsRttTimeSeriesTableData::write(ostream & os,
2976- uint8_t version = 0) const
2977+ uint8_t version /* = 0 */) const
2978 {
2979 uint32_t numRttEntries, rttEntryNum;
2980 uint32_t rttUsecs;
2981@@ -729,7 +732,7 @@
2982 //............................................................................
2983 //
2984 //----------------------------------------------------------------------------
2985-int ArtsRttTimeSeriesTableData::write(int fd, uint8_t version = 0) const
2986+int ArtsRttTimeSeriesTableData::write(int fd, uint8_t version /* = 0 */) const
2987 {
2988 uint32_t numRttEntries, rttEntryNum;
2989 uint32_t rttUsecs;
2990--- arts++-1-1-a9/classes/src/ArtsRttTimeSeriesTable.cc.orig Sat Nov 16 01:46:42 2002
2991+++ arts++-1-1-a9/classes/src/ArtsRttTimeSeriesTable.cc Fri Feb 13 16:03:26 2004
2992@@ -44,6 +44,8 @@
2993
2994 #include "ArtsRttTimeSeriesTable.hh"
2995
2996+using namespace std;
2997+
2998 static const string rcsid = "@(#) $Name$ $Id$";
2999
3000 //----------------------------------------------------------------------------
3001--- arts++-1-1-a9/classes/src/ArtsSelectedPortTableData.cc.orig Sat Nov 16 01:46:42 2002
3002+++ arts++-1-1-a9/classes/src/ArtsSelectedPortTableData.cc Fri Feb 13 16:04:24 2004
3003@@ -188,7 +188,7 @@
3004 //
3005 //-------------------------------------------------------------------------
3006 uint32_t
3007-ArtsSelectedPortTableData::ComputeLength(uint8_t version = 0) const
3008+ArtsSelectedPortTableData::ComputeLength(uint8_t version /* = 0 */) const
3009 {
3010 this->_length = 0;
3011
3012@@ -214,7 +214,7 @@
3013 //.........................................................................
3014 //
3015 //-------------------------------------------------------------------------
3016-uint32_t ArtsSelectedPortTableData::Length(uint8_t version = 0) const
3017+uint32_t ArtsSelectedPortTableData::Length(uint8_t version /* = 0 */) const
3018 {
3019 this->ComputeLength(version);
3020 return(this->_length);
3021@@ -227,7 +227,7 @@
3022 //
3023 //-------------------------------------------------------------------------
3024 istream& ArtsSelectedPortTableData::read(istream& is,
3025- uint8_t version = 0)
3026+ uint8_t version /* = 0 */)
3027 {
3028 uint32_t numPorts;
3029 uint32_t portNum;
3030@@ -251,7 +251,7 @@
3031 //.........................................................................
3032 //
3033 //-------------------------------------------------------------------------
3034-int ArtsSelectedPortTableData::read(int fd, uint8_t version = 0)
3035+int ArtsSelectedPortTableData::read(int fd, uint8_t version /* = 0 */)
3036 {
3037 uint32_t numPorts;
3038 uint32_t portNum;
3039@@ -298,7 +298,7 @@
3040 //
3041 //-------------------------------------------------------------------------
3042 ostream& ArtsSelectedPortTableData::write(ostream& os,
3043- uint8_t version = 0) const
3044+ uint8_t version /* = 0 */) const
3045 {
3046 uint32_t numPorts;
3047 vector<ArtsPortTableEntry>::const_iterator portEntry;
3048@@ -323,7 +323,7 @@
3049 //.........................................................................
3050 //
3051 //-------------------------------------------------------------------------
3052-int ArtsSelectedPortTableData::write(int fd, uint8_t version = 0) const
3053+int ArtsSelectedPortTableData::write(int fd, uint8_t version /* = 0 */) const
3054 {
3055 uint32_t numPorts;
3056 int rc;
3057--- arts++-1-1-a9/classes/src/ArtsSelectedPortTable.cc.orig Sat Nov 16 01:46:42 2002
3058+++ arts++-1-1-a9/classes/src/ArtsSelectedPortTable.cc Fri Feb 13 16:04:55 2004
3059@@ -44,6 +44,8 @@
3060
3061 #include "ArtsSelectedPortTable.hh"
3062
3063+using namespace std;
3064+
3065 static const string rcsid = "@(#) $Name$ $Id$";
3066
3067 //-------------------------------------------------------------------------
3068--- arts++-1-1-a9/classes/src/ArtsTimeIntervalSelectionSet.lex.orig Sat Nov 16 01:46:42 2002
3069+++ arts++-1-1-a9/classes/src/ArtsTimeIntervalSelectionSet.lex Fri Feb 13 16:06:05 2004
3070@@ -59,6 +59,8 @@
3071
3072 #include "ArtsTimeIntervalSelectionSet.hh"
3073
3074+using namespace std;
3075+
3076 static struct tm g_Tm;
3077 static time_t g_timeValue;
3078 %}
3079--- arts++-1-1-a9/classes/src/ArtsTosTableData.cc.orig Sat Nov 16 01:46:42 2002
3080+++ arts++-1-1-a9/classes/src/ArtsTosTableData.cc Fri Feb 13 16:08:24 2004
3081@@ -47,6 +47,8 @@
3082 #include "ArtsPrimitive.hh"
3083 #include "ArtsTosTableData.hh"
3084
3085+using namespace std;
3086+
3087 static const string rcsid = "@(#) $Name$ $Id$";
3088
3089 //-------------------------------------------------------------------------
3090@@ -166,7 +168,7 @@
3091 //-------------------------------------------------------------------------
3092 // uint32_t ArtsTosTableEntry::Length(uint8_t version = 0) const
3093 //-------------------------------------------------------------------------
3094-uint32_t ArtsTosTableEntry::Length(uint8_t version = 0) const
3095+uint32_t ArtsTosTableEntry::Length(uint8_t version /* = 0 */) const
3096 {
3097 uint32_t len = 0;
3098
3099@@ -181,15 +183,15 @@
3100 //-------------------------------------------------------------------------
3101 // istream& ArtsTosTableEntry::read(istream& is, uint8_t version = 0)
3102 //-------------------------------------------------------------------------
3103-istream& ArtsTosTableEntry::read(istream& is, uint8_t version = 0)
3104+istream& ArtsTosTableEntry::read(istream& is, uint8_t version /* = 0 */)
3105 {
3106 uint8_t fieldLen;
3107
3108 // tos number
3109- is.read(&this->_tosNum,sizeof(this->_tosNum));
3110+ is.read((char*)&this->_tosNum,sizeof(this->_tosNum));
3111
3112 // descriptor
3113- is.read(&this->_descriptor,sizeof(this->_descriptor));
3114+ is.read((char*)&this->_descriptor,sizeof(this->_descriptor));
3115
3116 // pkts
3117 fieldLen = (this->_descriptor >> 3) + 1;
3118@@ -205,7 +207,7 @@
3119 //-------------------------------------------------------------------------
3120 // int ArtsTosTableEntry::read(int fd, uint8_t version = 0)
3121 //-------------------------------------------------------------------------
3122-int ArtsTosTableEntry::read(int fd, uint8_t version = 0)
3123+int ArtsTosTableEntry::read(int fd, uint8_t version /* = 0 */)
3124 {
3125 uint8_t fieldLen;
3126 int rc = 0;
3127@@ -236,15 +238,15 @@
3128 // uint8_t version = 0) const
3129 //-------------------------------------------------------------------------
3130 ostream& ArtsTosTableEntry::write(ostream& os,
3131- uint8_t version = 0) const
3132+ uint8_t version /* = 0 */) const
3133 {
3134 uint8_t fieldLen;
3135
3136 // tos number
3137- os.write(&this->_tosNum,sizeof(this->_tosNum));
3138+ os.write((char*)&this->_tosNum,sizeof(this->_tosNum));
3139
3140 // descriptor
3141- os.write(&this->_descriptor,1);
3142+ os.write((char*)&this->_descriptor,1);
3143
3144 // pkts
3145 fieldLen = (this->_descriptor >> 3) + 1;
3146@@ -260,7 +262,7 @@
3147 //-------------------------------------------------------------------------
3148 // int ArtsTosTableEntry::write(int fd, uint8_t version = 0) const
3149 //-------------------------------------------------------------------------
3150-int ArtsTosTableEntry::write(int fd, uint8_t version = 0) const
3151+int ArtsTosTableEntry::write(int fd, uint8_t version /* = 0 */) const
3152 {
3153 uint8_t fieldLen;
3154 int rc = 0;
3155@@ -482,7 +484,7 @@
3156 //.........................................................................
3157 //
3158 //-------------------------------------------------------------------------
3159-uint32_t ArtsTosTableData::ComputeLength(uint8_t version = 0) const
3160+uint32_t ArtsTosTableData::ComputeLength(uint8_t version /* = 0 */) const
3161 {
3162 this->_length = 0;
3163
3164@@ -505,7 +507,7 @@
3165 //.........................................................................
3166 //
3167 //-------------------------------------------------------------------------
3168-uint32_t ArtsTosTableData::Length(uint8_t version = 0) const
3169+uint32_t ArtsTosTableData::Length(uint8_t version /* = 0 */) const
3170 {
3171 this->ComputeLength(version);
3172 return(this->_length);
3173@@ -516,7 +518,7 @@
3174 //.........................................................................
3175 //
3176 //-------------------------------------------------------------------------
3177-istream& ArtsTosTableData::read(istream& is, uint8_t version = 0)
3178+istream& ArtsTosTableData::read(istream& is, uint8_t version /* = 0 */)
3179 {
3180 uint32_t numToss;
3181 uint32_t tosNum;
3182@@ -539,7 +541,7 @@
3183 //.........................................................................
3184 //
3185 //-------------------------------------------------------------------------
3186-int ArtsTosTableData::read(int fd, uint8_t version = 0)
3187+int ArtsTosTableData::read(int fd, uint8_t version /* = 0 */)
3188 {
3189 uint32_t numToss;
3190 uint32_t tosNum;
3191@@ -581,7 +583,7 @@
3192 //
3193 //-------------------------------------------------------------------------
3194 ostream& ArtsTosTableData::write(ostream& os,
3195- uint8_t version = 0) const
3196+ uint8_t version /* = 0 */) const
3197 {
3198 uint32_t numToss;
3199
3200@@ -606,7 +608,7 @@
3201 //.........................................................................
3202 //
3203 //-------------------------------------------------------------------------
3204-int ArtsTosTableData::write(int fd, uint8_t version = 0) const
3205+int ArtsTosTableData::write(int fd, uint8_t version /* = 0 */) const
3206 {
3207 uint32_t numToss;
3208 int rc;
3209--- arts++-1-1-a9/classes/src/ArtsTosTable.cc.orig Sat Nov 16 01:46:42 2002
3210+++ arts++-1-1-a9/classes/src/ArtsTosTable.cc Fri Feb 13 16:11:15 2004
3211@@ -45,6 +45,8 @@
3212 #include "Arts.hh"
3213 #include "ArtsTosTable.hh"
3214
3215+using namespace std;
3216+
3217 static const string rcsid = "@(#) $Name$ $Id$";
3218
3219 //-------------------------------------------------------------------------
3220--- arts++-1-1-a9/classes/src/ArtsTosTableAggregatorMap.cc.orig Sat Nov 16 01:46:42 2002
3221+++ arts++-1-1-a9/classes/src/ArtsTosTableAggregatorMap.cc Fri Feb 13 16:13:41 2004
3222@@ -53,6 +53,9 @@
3223
3224 #include "ArtsTosTableAggregatorMap.hh"
3225
3226+#include <iterator>
3227+using namespace std;
3228+
3229 static const string rcsid = "@(#) $Name$ $Id$";
3230
3231 //-------------------------------------------------------------------------
Library for handling ARTS data files
This page took 0.56189 seconds and 4 git commands to generate.