Date: Wed, 11 Sep 2002 19:54:55 -0400 (EDT) From: Craig Rodrigues <rodrigc@attbi.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lyngbol@wheel.dk Subject: ports/42675: net/arts++ does not compile with GCC 3.2 Message-ID: <200209112354.g8BNstP5010699@dibbler.ne.client2.attbi.com>
next in thread | raw e-mail | index | archive | help
>Number: 42675
>Category: ports
>Synopsis: net/arts++ does not compile with GCC 3.2
>Confidential: no
>Severity: critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 11 17:00:07 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Craig Rodrigues
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dibbler.ne.client2.attbi.com 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Sun Sep 8 09:39:46 EDT 2002 rodrigc@dibbler.ne.client2.attbi.com:/usr/obj/usr/src/sys/MYKERNEL1 i386
>Description:
net/arts++ does not compile with GCC 3.2
>How-To-Repeat:
>Fix:
Patches follow:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# arts++/files
# arts++/files/patch-aa
#
echo c - arts++/files
mkdir -p arts++/files > /dev/null 2>&1
echo x - arts++/files/patch-aa
sed 's/^X//' >arts++/files/patch-aa << 'END-of-arts++/files/patch-aa'
X--- ./apps/artsasagg/artsasagg.cc.orig Mon Oct 2 13:05:10 2000
X+++ ./apps/artsasagg/artsasagg.cc Sun Sep 8 04:03:22 2002
X@@ -50,15 +50,21 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-#include <map>
X-
X #include "ArtsFileUtil.hh"
X #include "ArtsPackageVersion.hh"
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X #endif
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X+#endif
X+#include <string>
X+#include <map>
X
X extern int errno;
X
X--- ./apps/artsintfms/artsintfms.cc.orig Mon Oct 2 13:05:11 2000
X+++ ./apps/artsintfms/artsintfms.cc Sun Sep 8 04:03:22 2002
X@@ -51,13 +51,21 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsInterfaceMatrix.hh"
X #include "ArtsIfIndexSelectionSet.hh"
X #include "ArtsTimeIntervalSelectionSet.hh"
X #include "ArtsPackageVersion.hh"
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X+#endif
X+
X+#include <string>
X+
X
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X--- ./apps/artsnetagg/artsnetagg.cc.orig Mon Oct 2 13:05:11 2000
X+++ ./apps/artsnetagg/artsnetagg.cc Sun Sep 8 04:03:22 2002
X@@ -50,13 +50,18 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsFileUtil.hh"
X #include "ArtsPackageVersion.hh"
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X+#endif
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X #endif
X
X extern int errno;
X--- ./apps/artsnets/artsnets.cc.orig Mon Oct 2 13:05:12 2000
X+++ ./apps/artsnets/artsnets.cc Sun Sep 8 04:03:22 2002
X@@ -51,14 +51,22 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsNetMatrix.hh"
X #include "ArtsIfIndexSelectionSet.hh"
X #include "ArtsTimeIntervalSelectionSet.hh"
X #include "ArtsPackageVersion.hh"
X
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X+#endif
X+
X+#include <string>
X+
X+
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X #endif
X@@ -160,7 +168,7 @@
X }
X }
X
X- if (hostAttribute) {
X+ if (hostAttribute != arts.Attributes().end() ) {
X inAddr.s_addr = hostAttribute->Host();
X cout << "router: " << inet_ntoa(inAddr) << endl;
X }
X--- ./apps/artsnexthopagg/artsnexthopagg.cc.orig Mon Oct 2 13:05:12 2000
X+++ ./apps/artsnexthopagg/artsnexthopagg.cc Sun Sep 8 04:03:22 2002
X@@ -50,14 +50,21 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsFileUtil.hh"
X #include "ArtsPackageVersion.hh"
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X #endif
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X+#endif
X+
X+#include <string>
X
X extern char *tzname[2];
X extern int errno;
X--- ./apps/artsnexthops/artsnexthops.cc.orig Mon Oct 2 13:05:12 2000
X+++ ./apps/artsnexthops/artsnexthops.cc Sun Sep 8 04:03:22 2002
X@@ -51,14 +51,21 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsNextHopTable.hh"
X #include "ArtsIfIndexSelectionSet.hh"
X #include "ArtsTimeIntervalSelectionSet.hh"
X #include "ArtsPackageVersion.hh"
X
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X+#endif
X+
X+#include <string>
X+
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X #endif
X@@ -116,7 +123,7 @@
X }
X }
X
X- if (hostAttribute) {
X+ if (hostAttribute != arts.Attributes().end()) {
X inAddr.s_addr = hostAttribute->Host();
X cout << "router: " << inet_ntoa(inAddr) << endl;
X }
X@@ -135,7 +142,7 @@
X cout << endl;
X
X periodAttribute = arts.FindPeriodAttribute();
X- if (periodAttribute) {
X+ if (periodAttribute != arts.Attributes().end() ) {
X periodTimes[0] = periodAttribute->Period()[0];
X periodTimes[1] = periodAttribute->Period()[1];
X localTm = localtime(&(periodTimes[0]));
X--- ./apps/artsportagg/artsportagg.cc.orig Mon Oct 2 13:05:12 2000
X+++ ./apps/artsportagg/artsportagg.cc Sun Sep 8 04:03:22 2002
X@@ -50,14 +50,19 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsPortTableAggregator.hh"
X #include "Arts.hh"
X #include "ArtsPortTableAggregatorMapKey.hh"
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X+#endif
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X #endif
X
X extern char *tzname[2];
X--- ./apps/artsportms/artsportms.cc.orig Mon Oct 2 13:05:12 2000
X+++ ./apps/artsportms/artsportms.cc Sun Sep 8 04:03:22 2002
X@@ -51,13 +51,21 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsPortMatrix.hh"
X #include "ArtsIfIndexSelectionSet.hh"
X #include "ArtsTimeIntervalSelectionSet.hh"
X #include "ArtsPackageVersion.hh"
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X+#endif
X+
X+#include <string>
X+
X
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X--- ./apps/artsprotoagg/artsprotoagg.cc.orig Mon Oct 2 13:05:13 2000
X+++ ./apps/artsprotoagg/artsprotoagg.cc Sun Sep 8 04:03:22 2002
X@@ -50,13 +50,18 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsFileUtil.hh"
X #include "ArtsPackageVersion.hh"
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X+#endif
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X #endif
X
X extern char *tzname[2];
X--- ./apps/artsprotos/artsprotos.cc.orig Mon Oct 2 13:05:13 2000
X+++ ./apps/artsprotos/artsprotos.cc Sun Sep 8 04:03:22 2002
X@@ -52,14 +52,22 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsProtocolTable.hh"
X #include "ArtsIfIndexSelectionSet.hh"
X #include "ArtsTimeIntervalSelectionSet.hh"
X #include "ArtsPackageVersion.hh"
X
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+#else
X+# include <fstream.h>
X+#endif
X+
X+#include <string>
X+using namespace std;
X+
X+
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X #endif
X@@ -118,7 +126,7 @@
X }
X }
X
X- if (hostAttribute) {
X+ if (hostAttribute != arts.Attributes().end() ) {
X inAddr.s_addr = hostAttribute->Host();
X cout << "router: " << inet_ntoa(inAddr) << endl;
X }
X--- ./apps/artstoc/artstoc.cc.orig Mon Oct 2 13:05:13 2000
X+++ ./apps/artstoc/artstoc.cc Sun Sep 8 04:03:22 2002
X@@ -49,14 +49,19 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "Arts.hh"
X #include "ArtsTimeIntervalSelectionSet.hh"
X #include "ArtsPackageVersion.hh"
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X+#endif
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X #endif
X
X extern char *tzname[2];
X--- ./apps/artstos/artstos.cc.orig Mon Oct 2 13:05:13 2000
X+++ ./apps/artstos/artstos.cc Sun Sep 8 04:03:22 2002
X@@ -52,14 +52,19 @@
X #include <errno.h>
X }
X
X-#include <fstream.h>
X-#include <string>
X-
X #include "ArtsTosTable.hh"
X #include "ArtsIfIndexSelectionSet.hh"
X #include "ArtsTimeIntervalSelectionSet.hh"
X #include "ArtsPackageVersion.hh"
X
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X+#else
X+# include <fstream.h>
X+#endif
X+
X #ifndef NDEBUG
X #include "ArtsDebug.hh"
X #endif
X@@ -108,7 +113,7 @@
X }
X }
X
X- if (hostAttribute) {
X+ if (hostAttribute != arts.Attributes().end()) {
X inAddr.s_addr = hostAttribute->Host();
X cout << "router: " << inet_ntoa(inAddr) << endl;
X }
X@@ -126,7 +131,7 @@
X }
X cout << endl;
X
X- if (periodAttribute) {
X+ if (periodAttribute != arts.Attributes().end() ) {
X periodTimes[0] = periodAttribute->Period()[0];
X periodTimes[1] = periodAttribute->Period()[1];
X localTm = localtime(&(periodTimes[0]));
X--- ./classes/include/ArtsAttributeVector.hh.orig Mon Oct 2 13:05:14 2000
X+++ ./classes/include/ArtsAttributeVector.hh Sun Sep 8 04:03:22 2002
X@@ -44,6 +44,7 @@
X #define _ARTSATTRIBUTEVECTOR_HH_
X
X #include <vector>
X+using namespace std;
X
X #include "ArtsAttribute.hh"
X
X--- ./classes/include/Ipv4Network.hh.orig Tue Sep 12 14:26:26 2000
X+++ ./classes/include/Ipv4Network.hh Sun Sep 8 04:03:22 2002
X@@ -20,7 +20,8 @@
X }
X
X #ifdef HAVE_IOSTREAM
X- #include <iostream.h>
X+ #include <iostream>
X+ using namespace std;
X #else
X #include <iostream.h>
X #endif
X@@ -39,7 +40,7 @@
X {
X public:
X ipv4addr_t net;
X- uint8_t maskLen;
X+ char maskLen;
X
X //--------------------------------------------------------------------------
X // Ipv4Network()
X@@ -181,10 +182,10 @@
X istream & read(istream & is)
X {
X is.read(&this->maskLen,sizeof(this->maskLen));
X- uint8_t octet1 = 0;
X- uint8_t octet2 = 0;
X- uint8_t octet3 = 0;
X- uint8_t netSize = (this->maskLen + 7) / 8;
X+ char octet1 = 0;
X+ char octet2 = 0;
X+ char octet3 = 0;
X+ char netSize = (this->maskLen + 7) / 8;
X
X switch (netSize) {
X case 1:
X@@ -206,7 +207,7 @@
X ((ipv4addr_t)octet3 << 8));
X break;
X case 4:
X- is.read(&this->net,sizeof(this->net));
X+ is.read((char *)&this->net,sizeof(this->net));
X break;
X default:
X break;
X@@ -295,11 +296,11 @@
X // first we write the netmask length
X os.write(&this->maskLen,sizeof(this->maskLen));
X
X- uint8_t octet1 = 0;
X- uint8_t octet2 = 0;
X- uint8_t octet3 = 0;
X+ char octet1 = 0;
X+ char octet2 = 0;
X+ char octet3 = 0;
X ipv4addr_t netaddr;
X- uint8_t netSize = (this->maskLen + 7) / 8;
X+ char netSize = (this->maskLen + 7) / 8;
X
X // and then write the network prefix
X switch (netSize) {
X@@ -324,7 +325,7 @@
X os.write(&octet3,sizeof(octet3));
X break;
X case 4:
X- os.write(&this->net,sizeof(this->net));
X+ os.write((char *)&this->net,sizeof(this->net));
X break;
X default:
X break;
X--- ./classes/include/Ipv4PrefixPatricia.hh.in.orig Fri Jan 21 07:21:59 2000
X+++ ./classes/include/Ipv4PrefixPatricia.hh.in Sun Sep 8 04:03:22 2002
X@@ -80,6 +80,9 @@
X * December 1998
X */
X //----------------------------------------------------------------------------
X+
X+template <class Type> class Ipv4PrefixPatricia;
X+
X template <class Type>
X class Ipv4PrefixPatricia
X {
X@@ -215,7 +218,7 @@
X // class variables
X //------------------------------------------------------------------------
X Ipv4PrefixPatricia<Type> *nodePtr;
X- vector<VlsmListEntry>::iterator vlsmIter;
X+ typename vector<VlsmListEntry>::iterator vlsmIter;
X bool wentLeft;
X bool wentRight;
X
X@@ -227,7 +230,7 @@
X StackEntry()
X {
X this->nodePtr = (Ipv4PrefixPatricia<Type> *)0;
X- this->vlsmIter = (vector<VlsmListEntry>::iterator)0;
X+ this->vlsmIter = (typename vector<VlsmListEntry>::iterator)0;
X this->wentLeft = false;
X this->wentRight = false;
X }
X@@ -253,7 +256,7 @@
X ~StackEntry()
X {
X this->nodePtr = (Ipv4PrefixPatricia<Type> *)0;
X- this->vlsmIter = (vector<VlsmListEntry>::iterator)0;
X+ this->vlsmIter = (typename vector<VlsmListEntry>::iterator)0;
X }
X
X //-------------------------------------------------------------------------
X@@ -297,7 +300,7 @@
X vector<StackEntry> nodeStack;
X Ipv4PrefixPatricia<Type> *nodePtr;
X bool end;
X- VlsmList::iterator vlsmIter;
X+ typename VlsmList::iterator vlsmIter;
X
X //------------------------------------------------------------------------
X // iterator()
X@@ -366,7 +369,7 @@
X //------------------------------------------------------------------------
X iterator & operator ++ (int foo)
X {
X- vector<StackEntry>::iterator stackIter;
X+ typename vector<StackEntry>::iterator stackIter;
X uint32_t bitNum;
X Ipv4PrefixPatricia<Type> *leftNode;
X Ipv4PrefixPatricia<Type> *rightNode;
X@@ -501,7 +504,7 @@
X public:
X vector<StackEntry> nodeStack;
X Ipv4PrefixPatricia<Type> *nodePtr;
X- VlsmList::reverse_iterator vlsmIter;
X+ typename VlsmList::reverse_iterator vlsmIter;
X bool end;
X
X //------------------------------------------------------------------------
X@@ -556,7 +559,7 @@
X //------------------------------------------------------------------------
X reverse_iterator & operator ++ (int foo)
X {
X- vector<StackEntry>::iterator stackIter;
X+ typename vector<StackEntry>::iterator stackIter;
X uint32_t bitNum;
X Ipv4PrefixPatricia<Type> *leftNode;
X Ipv4PrefixPatricia<Type> *rightNode;
X@@ -721,7 +724,7 @@
X {
X StackEntry stackEntry;
X iterator retIter;
X- vector<StackEntry>::iterator stackIter;
X+ typename vector<StackEntry>::iterator stackIter;
X Ipv4PrefixPatricia<Type> *leftNode;
X Ipv4PrefixPatricia<Type> *rightNode;
X uint32_t bitNum;
X@@ -799,7 +802,7 @@
X {
X StackEntry stackEntry;
X reverse_iterator retIter;
X- vector<StackEntry>::iterator stackIter;
X+ typename vector<StackEntry>::iterator stackIter;
X Ipv4PrefixPatricia<Type> *leftNode;
X Ipv4PrefixPatricia<Type> *rightNode;
X uint32_t bitNum;
X@@ -912,7 +915,7 @@
X {
X iterator retIter;
X Ipv4PrefixPatricia<Type> *treeNode, *nextNode;
X- vector<VlsmListEntry>::iterator vlsmIter;
X+ typename vector<VlsmListEntry>::iterator vlsmIter;
X
X treeNode = this;
X nextNode = treeNode->lft;
X@@ -955,7 +958,7 @@
X {
X iterator retIter;
X Ipv4PrefixPatricia<Type> *treeNode, *nextNode;
X- vector<VlsmListEntry>::iterator vlsmIter;
X+ typename vector<VlsmListEntry>::iterator vlsmIter;
X
X treeNode = this;
X nextNode = treeNode->lft;
X@@ -1026,7 +1029,7 @@
X //--------------------------------------------------------------------------
X pair<iterator,bool> & insert(const value_type & value)
X {
X- static pair<Ipv4PrefixPatricia<Type>::iterator,bool> retVal;
X+ static pair<typename Ipv4PrefixPatricia<Type>::iterator,bool> retVal;
X
X retVal = _insert(value);
X if (retVal.second) {
X@@ -1043,7 +1046,7 @@
X //
X //--------------------------------------------------------------------------
X inline void
X- visit(void (*visitFunc)(VlsmList::iterator & value, void *),
X+ visit(void (*visitFunc)(typename VlsmList::iterator & value, void *),
X void *other)
X {
X _visit(this->lft,visitFunc,other,33);
X@@ -1078,7 +1081,7 @@
X }
X
X bool foundVlsmEntry = false;
X- VlsmList::iterator vlsmDeleteIter;
X+ typename VlsmList::iterator vlsmDeleteIter;
X
X for (vlsmDeleteIter = dnode->vlsmVect.begin();
X vlsmDeleteIter != dnode->vlsmVect.end(); vlsmDeleteIter++) {
X@@ -1231,7 +1234,7 @@
X }
X
X bool foundVlsmEntry = false;
X- VlsmList::iterator vlsmDeleteIter;
X+ typename VlsmList::iterator vlsmDeleteIter;
X
X for (vlsmDeleteIter = dnode->vlsmVect.begin();
X vlsmDeleteIter != dnode->vlsmVect.end(); vlsmDeleteIter++) {
X@@ -1361,7 +1364,7 @@
X uint32_t erase(const iterator & start, const iterator & finish)
X {
X vector<key_type> keyVector;
X- vector<key_type>::iterator keyVectorIter;
X+ typename vector<key_type>::iterator keyVectorIter;
X iterator iter;
X uint32_t numErased = 0;
X
X@@ -1455,7 +1458,7 @@
X {
X Ipv4PrefixPatricia<Type> *p, *t, *x;
X uint32_t i = 32;
X- VlsmList::iterator vlsmIter;
X+ typename VlsmList::iterator vlsmIter;
X
X p = this;
X t = lft;
X@@ -1553,13 +1556,13 @@
X //--------------------------------------------------------------------------
X inline void
X _visit(Ipv4PrefixPatricia<Type> *head,
X- void (*visitFunc)(VlsmList::iterator & value, void *),
X+ void (*visitFunc)(typename VlsmList::iterator & value, void *),
X void *other, uint32_t bitNum)
X {
X Ipv4PrefixPatricia<Type> *p;
X Ipv4PrefixPatricia<Type> *leftNode;
X Ipv4PrefixPatricia<Type> *rightNode;
X- VlsmList::iterator vlsmIter;
X+ typename VlsmList::iterator vlsmIter;
X
X p = head;
X leftNode = head->lft;
X--- ./classes/include/ArtsHeader.hh.orig Mon Oct 2 13:05:15 2000
X+++ ./classes/include/ArtsHeader.hh Sun Sep 8 04:03:22 2002
X@@ -50,11 +50,13 @@
X #include "caida_t.h"
X }
X
X-#include <ostream.h>
X #ifdef HAVE_IOMANIP
X- #include <iomanip>
X+# include <ostream>
X+# include <iomanip>
X+ using namespace std;
X #else
X- #include <iomanip.h>
X+# include <ostream.h>
X+# include <iomanip.h>
X #endif
X
X //---------------------------------------------------------------------------
X--- ./classes/include/ArtsAttribute.hh.orig Mon Oct 2 13:05:14 2000
X+++ ./classes/include/ArtsAttribute.hh Sun Sep 8 04:03:22 2002
X@@ -44,6 +44,7 @@
X #define _ARTSATTRIBUTE_HH_
X
X extern "C" {
X+#include "artslocal.h"
X #include <sys/types.h>
X #include <assert.h>
X
X@@ -51,7 +52,13 @@
X }
X
X #include <string>
X-#include <istream.h>
X+
X+#ifdef HAVE_IOSTREAM
X+# include <iostream>
X+using namespace std;
X+#else
X+# include <istream.h>
X+#endif
X
X //---------------------------------------------------------------------------
X // Object Attribute Identifiers
X--- ./classes/include/ArtsAsMatrixData.hh.orig Mon Oct 2 13:05:14 2000
X+++ ./classes/include/ArtsAsMatrixData.hh Sun Sep 8 04:03:22 2002
X@@ -52,11 +52,10 @@
X
X #ifdef HAVE_IOSTREAM
X #include <iostream>
X+ using namespace std;
X #else
X #include <iostream.h>
X #endif
X-// #include <istream.h>
X-// #include <ostream.h>
X #include <algorithm>
X
X #include "ArtsAsMatrixEntry.hh"
X--- ./classes/include/ArtsAsMatrixEntry.hh.orig Mon Oct 2 13:05:14 2000
X+++ ./classes/include/ArtsAsMatrixEntry.hh Sun Sep 8 04:03:22 2002
X@@ -50,7 +50,12 @@
X #include "caida_t.h"
X }
X
X-#include <ostream.h>
X+#ifdef HAVE_IOSTREAM
X+# include <iostream>
X+ using namespace std;
X+#else
X+# include <iostream.h>
X+#endif
X
X #ifdef HAVE_IOMANIP
X #include <iomanip>
X--- ./classes/include/ArtsNetMatrixData.hh.orig Mon Oct 2 13:05:17 2000
X+++ ./classes/include/ArtsNetMatrixData.hh Sun Sep 8 04:03:22 2002
X@@ -44,12 +44,19 @@
X #define ARTSNETMATRIXDATA_HH_
X
X extern "C" {
X+#include "artslocal.h"
X #include "caida_t.h"
X }
X
X #include <vector>
X-#include <istream.h>
X-#include <ostream.h>
X+
X+#ifdef HAVE_IOSTREAM
X+# include <iostream>
X+using namespace std;
X+#else
X+# include <istream.h>
X+# include <ostream.h>
X+#endif
X
X #include "ArtsNetMatrixEntry.hh"
X
X--- ./classes/include/ArtsPrimitive.hh.orig Mon Oct 2 13:05:19 2000
X+++ ./classes/include/ArtsPrimitive.hh Sun Sep 8 04:03:22 2002
X@@ -43,13 +43,19 @@
X #ifndef _ARTSPRIMITIVE_HH_
X #define _ARTSPRIMITIVE_HH_
X
X-#include <iostream.h>
X
X extern "C" {
X+#include "artslocal.h"
X #include "caida_t.h"
X #include <unistd.h>
X }
X
X+#ifdef HAVE_IOSTREAM
X+# include <iostream>
X+ using namespace std;
X+#else
X+# include <iostream.h>
X+#endif
X //---------------------------------------------------------------------------
X // class ArtsPrimitive
X //---------------------------------------------------------------------------
X--- ./classes/include/ArtsIpPathEntry.hh.orig Mon Oct 2 13:05:16 2000
X+++ ./classes/include/ArtsIpPathEntry.hh Sun Sep 8 04:03:22 2002
X@@ -54,6 +54,7 @@
X
X #ifdef HAVE_IOSTREAM
X #include <iostream>
X+ using namespace std;
X #else
X #include <iostream.h>
X #endif
X--- ./classes/include/ArtsCflowdCustomData.hh.orig Tue Nov 9 05:39:42 1999
X+++ ./classes/include/ArtsCflowdCustomData.hh Sun Sep 8 04:03:22 2002
X@@ -20,6 +20,7 @@
X }
X
X #include <map>
X+using namespace std;
X
X //----------------------------------------------------------------------------
X // class ArtsCflowdCustomDataKey
X@@ -145,4 +146,5 @@
X };
X
X
X-#endif // _ARTSCFLOWDCUSTOMDATA_HH_
X+#endif /* _ARTSCFLOWDCUSTOMDATA_HH_ */
X+
X--- ./classes/include/ArtsFileUtil.hh.orig Mon Oct 2 13:05:15 2000
X+++ ./classes/include/ArtsFileUtil.hh Sun Sep 8 04:03:22 2002
X@@ -43,9 +43,16 @@
X #ifndef _ARTSFILEUTIL_HH_
X #define _ARTSFILEUTIL_HH_
X
X+#include "artslocal.h"
X+
X #include <string>
X #include <vector>
X-#include <fstream.h>
X+
X+#ifdef HAVE_FSTREAM
X+# include <fstream>
X+#else
X+# include <fstream.h>
X+#endif
X
X #include "ArtsProtocolTableAggregatorMap.hh"
X #include "ArtsInterfaceMatrixAggregatorMap.hh"
X--- ./classes/include/ArtsSelectionSet.hh.orig Mon Oct 2 13:05:20 2000
X+++ ./classes/include/ArtsSelectionSet.hh Sun Sep 8 04:03:22 2002
X@@ -49,6 +49,7 @@
X
X #include <vector>
X #include <algorithm>
X+using namespace std;
X
X #include "ArtsSelection.hh"
X
X@@ -96,7 +97,7 @@
X //-------------------------------------------------------------------------
X bool Matches(const Type & value) const
X {
X- const_iterator selectionIter;
X+ typename ArtsSelectionSet<Type>::const_iterator selectionIter;
X bool rc = false;
X
X for (selectionIter = this->begin(); selectionIter != this->end();
X--- ./classes/include/ArtsInterfaceMatrixData.hh.orig Mon Oct 2 13:05:16 2000
X+++ ./classes/include/ArtsInterfaceMatrixData.hh Sun Sep 8 04:03:22 2002
X@@ -44,15 +44,17 @@
X #define ARTSINTERFACEMATRIXDATA_HH_
X
X extern "C" {
X+#include "artslocal.h"
X #include "caida_t.h"
X }
X
X #include <vector>
X
X #ifdef HAVE_IOSTREAM
X- #include <iostream>
X+# include <iostream>
X+ using namespace std;
X #else
X- #include <iostream.h>
X+# include <iostream.h>
X #endif
X #include <algorithm>
X
X--- ./classes/include/ArtsNetMatrixEntry.hh.orig Mon Oct 2 13:05:17 2000
X+++ ./classes/include/ArtsNetMatrixEntry.hh Sun Sep 8 04:03:22 2002
X@@ -51,9 +51,10 @@
X }
X
X #ifdef HAVE_IOSTREAM
X- #include <iostream>
X+# include <iostream>
X+ using namespace std;
X #else
X- #include <iostream.h>
X+# include <iostream.h>
X #endif
X
X #ifdef HAVE_IOMANIP
X--- ./classes/include/ArtsPackageVersion.hh.orig Mon Oct 2 13:05:18 2000
X+++ ./classes/include/ArtsPackageVersion.hh Sun Sep 8 04:03:22 2002
X@@ -44,6 +44,7 @@
X #define _ARTSPACKAGEVERSION_HH_
X
X #include <string>
X+using namespace std;
X
X //---------------------------------------------------------------------------
X // class ArtsPackageVersion
X--- ./classes/include/ArtsPortMatrixEntry.hh.orig Mon Oct 2 13:05:18 2000
X+++ ./classes/include/ArtsPortMatrixEntry.hh Sun Sep 8 04:03:22 2002
X@@ -50,15 +50,16 @@
X }
X
X #ifdef HAVE_IOSTREAM
X- #include <iostream>
X+# include <iostream>
X+ using namespace std;
X #else
X- #include <iostream.h>
X+# include <iostream.h>
X #endif
X
X #ifdef HAVE_IOMANIP
X- #include <iomanip>
X+# include <iomanip>
X #else
X- #include <iomanip.h>
X+# include <iomanip.h>
X #endif
X
X //---------------------------------------------------------------------------
X--- ./classes/include/ArtsRttTimeSeriesTableData.hh.orig Thu Oct 19 19:37:14 2000
X+++ ./classes/include/ArtsRttTimeSeriesTableData.hh Sun Sep 8 04:03:22 2002
X@@ -47,7 +47,15 @@
X #include <sys/time.h>
X
X #include "caida_t.h"
X+#include "artslocal.h"
X }
X+
X+#ifdef HAVE_IOSTREAM
X+# include <iostream>
X+ using namespace std;
X+#else
X+# include <iostream.h>
X+#endif
X
X #include <vector>
X
X--- ./classes/src/ArtsHeader.cc.orig Mon Oct 2 13:05:24 2000
X+++ ./classes/src/ArtsHeader.cc Sun Sep 8 04:03:22 2002
X@@ -135,23 +135,23 @@
X uint32_t uIntDatum, idAndVersion;
X
X uShortDatum = htons(this->_magic);
X- os.write(&uShortDatum,sizeof(uShortDatum));
X+ os.write((char *)&uShortDatum,sizeof(uShortDatum));
X
X idAndVersion = (this->_identifier << 4) | this->_version;
X uIntDatum = htonl(idAndVersion);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X
X uIntDatum = htonl(this->_flags);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X
X uShortDatum = htons(this->_numAttributes);
X- os.write(&uShortDatum,sizeof(uShortDatum));
X+ os.write((char *)&uShortDatum,sizeof(uShortDatum));
X
X uIntDatum = htonl(this->_attrLength);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X
X uIntDatum = htonl(this->_dataLength);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X
X return(os);
X }
X@@ -225,13 +225,13 @@
X uint32_t uIntDatum;
X uint32_t idAndVersion;
X
X- is.read(&uShortDatum,sizeof(uShortDatum));
X+ is.read((char *)&uShortDatum,sizeof(uShortDatum));
X if (is.eof())
X return(is);
X
X this->_magic = ntohs(uShortDatum);
X
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X if (is.eof())
X return(is);
X
X@@ -239,22 +239,22 @@
X this->_identifier = idAndVersion >> 4;
X this->_version = idAndVersion & 0x0f;
X
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X if (is.eof())
X return(is);
X this->_flags = ntohl(uIntDatum);
X
X- is.read(&uShortDatum,sizeof(uShortDatum));
X+ is.read((char *)&uShortDatum,sizeof(uShortDatum));
X if (is.eof())
X return(is);
X this->_numAttributes = ntohs(uShortDatum);
X
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X if (is.eof())
X return(is);
X this->_attrLength = ntohl(uIntDatum);
X
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X if (is.eof())
X return(is);
X this->_dataLength = ntohl(uIntDatum);
X--- ./classes/src/ArtsAttribute.cc.orig Mon Oct 2 13:05:22 2000
X+++ ./classes/src/ArtsAttribute.cc Sun Sep 8 04:03:22 2002
X@@ -41,6 +41,7 @@
X //===========================================================================
X
X extern "C" {
X+#include "artslocal.h"
X #include <sys/types.h>
X #include <sys/socket.h>
X #include <netinet/in.h>
X@@ -51,7 +52,12 @@
X }
X
X #include <string>
X-#include <iomanip.h>
X+#if HAVE_IOMANIP
X+# include <iomanip>
X+ using namespace std;
X+#else
X+# include <iomanip.h>
X+#endif
X
X #include "ArtsAttribute.hh"
X #include "ArtsPrimitive.hh"
X@@ -487,10 +493,10 @@
X
X idAndFormat = (this->_identifier << 8) | this->_format;
X uIntDatum = htonl(idAndFormat);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X
X uIntDatum = htonl(this->_length);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X
X switch (this->_identifier) {
X case artsC_ATTR_COMMENT:
X@@ -499,16 +505,16 @@
X break;
X case artsC_ATTR_CREATION:
X uIntDatum = htonl(this->_value.creation);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X break;
X case artsC_ATTR_PERIOD:
X uIntDatum = htonl(this->_value.period[0]);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X uIntDatum = htonl(this->_value.period[1]);
X- os.write(&uIntDatum,sizeof(uIntDatum));
X+ os.write((char *)&uIntDatum,sizeof(uIntDatum));
X break;
X case artsC_ATTR_HOST:
X- os.write(&this->_value.host,sizeof(this->_value.host));
X+ os.write((char *)&this->_value.host,sizeof(this->_value.host));
X break;
X case artsC_ATTR_IFDESCR:
X ptr = this->_value.ifDescr->c_str();
X@@ -516,14 +522,14 @@
X break;
X case artsC_ATTR_IFINDEX:
X uShortDatum = htons(this->_value.ifIndex);
X- os.write(&uShortDatum,sizeof(uShortDatum));
X+ os.write((char *)&uShortDatum,sizeof(uShortDatum));
X break;
X case artsC_ATTR_IFIPADDR:
X- os.write(&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
X+ os.write((char *)&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
X break;
X case artsC_ATTR_HOSTPAIR:
X- os.write(&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
X- os.write(&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
X+ os.write((char *)&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
X+ os.write((char *)&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
X break;
X default:
X break;
X@@ -675,12 +681,12 @@
X break;
X }
X
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X idAndFormat = ntohl(uIntDatum);
X this->_identifier = idAndFormat >> 8;
X this->_format = idAndFormat & 0xff;
X
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X this->_length = ntohl(uIntDatum);
X
X switch (this->_identifier) {
X@@ -693,17 +699,17 @@
X free(ptr);
X break;
X case artsC_ATTR_CREATION:
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X this->_value.creation = ntohl(uIntDatum);
X break;
X case artsC_ATTR_PERIOD:
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X this->_value.period[0] = htonl(uIntDatum);
X- is.read(&uIntDatum,sizeof(uIntDatum));
X+ is.read((char *)&uIntDatum,sizeof(uIntDatum));
X this->_value.period[1] = htonl(uIntDatum);
X break;
X case artsC_ATTR_HOST:
X- is.read(&this->_value.host,sizeof(this->_value.host));
X+ is.read((char *)&this->_value.host,sizeof(this->_value.host));
X break;
X case artsC_ATTR_IFDESCR:
X ptr = (char *)malloc(this->_length - (sizeof(uint32_t) * 2));
X@@ -714,15 +720,15 @@
X free(ptr);
X break;
X case artsC_ATTR_IFINDEX:
X- is.read(&this->_value.ifIndex,sizeof(this->_value.ifIndex));
X+ is.read((char *)&this->_value.ifIndex,sizeof(this->_value.ifIndex));
X this->_value.ifIndex = ntohs(this->_value.ifIndex);
X break;
X case artsC_ATTR_IFIPADDR:
X- is.read(&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
X+ is.read((char *)&this->_value.ifIpAddr,sizeof(this->_value.ifIpAddr));
X break;
X case artsC_ATTR_HOSTPAIR:
X- is.read(&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
X- is.read(&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
X+ is.read((char *)&(this->_value.hostPair[0]),sizeof(ipv4addr_t));
X+ is.read((char *)&(this->_value.hostPair[1]),sizeof(ipv4addr_t));
X break;
X default:
X break;
X--- ./classes/src/ArtsIpPathEntry.cc.orig Mon Oct 2 13:05:25 2000
X+++ ./classes/src/ArtsIpPathEntry.cc Sun Sep 8 04:03:22 2002
X@@ -111,13 +111,13 @@
X //------------------------------------------------------------------------
X // istream& ArtsIpPathEntry::read(istream& is, uint8_t version = 0)
X //------------------------------------------------------------------------
X-istream& ArtsIpPathEntry::read(istream& is, uint8_t version = 0)
X+istream& ArtsIpPathEntry::read(istream& is, uint8_t version)
X {
X- is.read(&this->_hopNum,sizeof(this->_hopNum));
X+ is.read((char *)&this->_hopNum,sizeof(this->_hopNum));
X if (! is)
X return(is);
X
X- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
X+ is.read((char *)&this->_ipAddr,sizeof(this->_ipAddr));
X if (! is)
X return(is);
X
X@@ -130,7 +130,7 @@
X this->_rtt.tv_sec = fourBytes / 1000000;
X this->_rtt.tv_usec = fourBytes % 1000000;
X
X- is.read(&this->_numTries,sizeof(this->_numTries));
X+ is.read((char *)&this->_numTries,sizeof(this->_numTries));
X }
X
X return(is);
X@@ -141,7 +141,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsIpPathEntry::read(int fd, uint8_t version = 0)
X+int ArtsIpPathEntry::read(int fd, uint8_t version)
X {
X int rc;
X int bytesRead = 0;
X@@ -182,15 +182,15 @@
X //------------------------------------------------------------------------
X // ostream& ArtsIpPathEntry::write(ostream& os, uint8_t version = 0) const
X //------------------------------------------------------------------------
X-ostream& ArtsIpPathEntry::write(ostream& os, uint8_t version = 0) const
X+ostream& ArtsIpPathEntry::write(ostream& os, uint8_t version) const
X {
X- os.write(&this->_hopNum,sizeof(this->_hopNum));
X- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
X+ os.write((char *)&this->_hopNum,sizeof(this->_hopNum));
X+ os.write((char *)&this->_ipAddr,sizeof(this->_ipAddr));
X
X if (version == 1) {
X uint32_t fourBytes = (this->_rtt.tv_sec * 1000000) + this->_rtt.tv_usec;
X g_ArtsLibInternal_Primitive.WriteUint32(os,fourBytes,4);
X- os.write(&this->_numTries,sizeof(this->_numTries));
X+ os.write((char *)&this->_numTries,sizeof(this->_numTries));
X }
X
X return(os);
X@@ -201,7 +201,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsIpPathEntry::write(int fd, uint8_t version = 0) const
X+int ArtsIpPathEntry::write(int fd, uint8_t version) const
X {
X int rc;
X int bytesWritten = 0;
X--- ./classes/src/ArtsIpPathData.cc.orig Mon Oct 2 13:05:25 2000
X+++ ./classes/src/ArtsIpPathData.cc Sun Sep 8 04:03:22 2002
X@@ -187,7 +187,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-uint32_t ArtsIpPathData::Length(uint8_t version = 0) const
X+uint32_t ArtsIpPathData::Length(uint8_t version) const
X {
X uint32_t len = sizeof(this->_src) + sizeof(this->_dst) +
X sizeof(this->_rtt) + sizeof(this->_hopDistance) + sizeof(this->_numHops);
X@@ -209,28 +209,28 @@
X //------------------------------------------------------------------------
X // ostream& ArtsIpPathData::write(ostream& os, uint8_t version = 0)
X //------------------------------------------------------------------------
X-ostream& ArtsIpPathData::write(ostream& os, uint8_t version = 0)
X+ostream& ArtsIpPathData::write(ostream& os, uint8_t version)
X {
X uint32_t timeDatum;
X uint8_t completeAndNumHops;
X
X- os.write(&this->_src,sizeof(this->_src));
X- os.write(&this->_dst,sizeof(this->_dst));
X+ os.write((char *)&this->_src,sizeof(this->_src));
X+ os.write((char *)&this->_dst,sizeof(this->_dst));
X
X timeDatum = htonl(this->_rtt.tv_sec);
X- os.write(&timeDatum,sizeof(timeDatum));
X+ os.write((char *)&timeDatum,sizeof(timeDatum));
X timeDatum = htonl(this->_rtt.tv_usec);
X- os.write(&timeDatum,sizeof(timeDatum));
X+ os.write((char *)&timeDatum,sizeof(timeDatum));
X
X- os.write(&this->_hopDistance,sizeof(this->_hopDistance));
X+ os.write((char *)&this->_hopDistance,sizeof(this->_hopDistance));
X
X completeAndNumHops = (this->_isComplete << 7) | this->_numHops;
X- os.write(&completeAndNumHops,sizeof(completeAndNumHops));
X+ os.write((char *)&completeAndNumHops,sizeof(completeAndNumHops));
X
X if (version == 1) {
X if (! this->_isComplete) {
X- os.write(&this->_incompleteReason,sizeof(this->_incompleteReason));
X- os.write(&this->_incompleteFlags,sizeof(this->_incompleteFlags));
X+ os.write((char *)&this->_incompleteReason,sizeof(this->_incompleteReason));
X+ os.write((char *)&this->_incompleteFlags,sizeof(this->_incompleteFlags));
X }
X }
X
X@@ -251,7 +251,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsIpPathData::write(int fd, uint8_t version = 0)
X+int ArtsIpPathData::write(int fd, uint8_t version)
X {
X uint32_t timeDatum;
X uint8_t completeAndNumHops;
X@@ -334,30 +334,30 @@
X //------------------------------------------------------------------------
X // istream& ArtsIpPathData::read(istream& is, uint8_t version = 0)
X //------------------------------------------------------------------------
X-istream& ArtsIpPathData::read(istream& is, uint8_t version = 0)
X+istream& ArtsIpPathData::read(istream& is, uint8_t version)
X {
X uint32_t timeDatum;
X uint8_t completeAndNumHops;
X size_t hopNum;
X
X- is.read(&this->_src,sizeof(this->_src));
X- is.read(&this->_dst,sizeof(this->_dst));
X+ is.read((char *)&this->_src,sizeof(this->_src));
X+ is.read((char *)&this->_dst,sizeof(this->_dst));
X
X- is.read(&timeDatum,sizeof(timeDatum));
X+ is.read((char *)&timeDatum,sizeof(timeDatum));
X this->_rtt.tv_sec = ntohl(timeDatum);
X- is.read(&timeDatum,sizeof(timeDatum));
X+ is.read((char *)&timeDatum,sizeof(timeDatum));
X this->_rtt.tv_usec = ntohl(timeDatum);
X
X- is.read(&this->_hopDistance,sizeof(this->_hopDistance));
X+ is.read((char *)&this->_hopDistance,sizeof(this->_hopDistance));
X
X- is.read(&completeAndNumHops,sizeof(completeAndNumHops));
X+ is.read((char *)&completeAndNumHops,sizeof(completeAndNumHops));
X this->_isComplete = completeAndNumHops >> 7;
X this->_numHops = completeAndNumHops & 0x7f;
X
X if (version == 1) {
X if (! this->_isComplete) {
X- is.read(&this->_incompleteReason,sizeof(this->_incompleteReason));
X- is.read(&this->_incompleteFlags,sizeof(this->_incompleteFlags));
X+ is.read((char *)&this->_incompleteReason,sizeof(this->_incompleteReason));
X+ is.read((char *)&this->_incompleteFlags,sizeof(this->_incompleteFlags));
X }
X }
X
X@@ -384,7 +384,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsIpPathData::read(int fd, uint8_t version = 0)
X+int ArtsIpPathData::read(int fd, uint8_t version)
X {
X uint32_t timeDatum;
X uint8_t completeAndNumHops;
X--- ./classes/src/ArtsAsMatrixEntry.cc.orig Mon Oct 2 13:05:22 2000
X+++ ./classes/src/ArtsAsMatrixEntry.cc Sun Sep 8 04:03:22 2002
X@@ -180,7 +180,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsAsMatrixEntry::Length(uint8_t version = 0) const
X+uint32_t ArtsAsMatrixEntry::Length(uint8_t version) const
X {
X uint32_t length;
X
X@@ -197,14 +197,14 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream& ArtsAsMatrixEntry::read(istream& is, uint8_t version = 0)
X+istream& ArtsAsMatrixEntry::read(istream& is, uint8_t version)
X {
X uint8_t bytesize,
X pktsize,
X srcsize,
X dstsize;
X
X- is.read(&this->_descriptor,sizeof(this->_descriptor));
X+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X srcsize = (this->_descriptor & 0x01) + 1;
X dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
X@@ -224,7 +224,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsAsMatrixEntry::read(int fd, uint8_t version = 0)
X+int ArtsAsMatrixEntry::read(int fd, uint8_t version)
X {
X uint8_t bytesize,
X pktsize,
X@@ -277,14 +277,14 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-ostream & ArtsAsMatrixEntry::write(ostream & os, uint8_t version = 0) const
X+ostream & ArtsAsMatrixEntry::write(ostream & os, uint8_t version) const
X {
X uint8_t bytesize,
X pktsize,
X srcsize,
X dstsize;
X
X- os.write(&this->_descriptor,sizeof(this->_descriptor));
X+ os.write((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X srcsize = (this->_descriptor & 0x01) + 1;
X dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
X@@ -304,7 +304,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsAsMatrixEntry::write(int fd, uint8_t version = 0) const
X+int ArtsAsMatrixEntry::write(int fd, uint8_t version) const
X {
X uint8_t bytesize,
X pktsize,
X--- ./classes/src/ArtsAsMatrixData.cc.orig Mon Oct 2 13:05:22 2000
X+++ ./classes/src/ArtsAsMatrixData.cc Sun Sep 8 04:03:22 2002
X@@ -81,7 +81,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream & ArtsAsMatrixData::read(istream& is, uint8_t version = 0)
X+istream & ArtsAsMatrixData::read(istream& is, uint8_t version)
X {
X uint32_t entryNum;
X ArtsAsMatrixEntry asEntry;
X@@ -106,7 +106,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsAsMatrixData::read(int fd, uint8_t version = 0)
X+int ArtsAsMatrixData::read(int fd, uint8_t version)
X {
X uint32_t entryNum;
X ArtsAsMatrixEntry asEntry;
X@@ -161,7 +161,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-ostream & ArtsAsMatrixData::write(ostream& os, uint8_t version = 0)
X+ostream & ArtsAsMatrixData::write(ostream& os, uint8_t version)
X {
X uint32_t entryNum;
X
X@@ -183,7 +183,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsAsMatrixData::write(int fd, uint8_t version = 0)
X+int ArtsAsMatrixData::write(int fd, uint8_t version)
X {
X uint32_t entryNum;
X int rc;
X@@ -235,7 +235,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsAsMatrixData::Length(uint8_t version = 0) const
X+uint32_t ArtsAsMatrixData::Length(uint8_t version) const
X {
X uint32_t length = 0;
X
X--- ./classes/src/ArtsAsMatrixAggregatorMap.cc.orig Mon Oct 2 13:05:22 2000
X+++ ./classes/src/ArtsAsMatrixAggregatorMap.cc Sun Sep 8 04:03:22 2002
X@@ -46,9 +46,11 @@
X
X #include <string>
X #ifdef HAVE_FSTREAM
X- #include <fstream>
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X #else
X- #include <fstream.h>
X+# include <fstream.h>
X #endif
X
X #include "ArtsAsMatrixAggregatorMap.hh"
X--- ./classes/src/ArtsBgp4AggregatorAttribute.cc.orig Mon Oct 2 13:05:22 2000
X+++ ./classes/src/ArtsBgp4AggregatorAttribute.cc Sun Sep 8 04:03:22 2002
X@@ -154,10 +154,10 @@
X //
X //----------------------------------------------------------------------------
X istream & ArtsBgp4AggregatorAttribute::read(istream & is,
X- uint8_t version = 0)
X+ uint8_t version)
X {
X g_ArtsLibInternal_Primitive.ReadUint16(is,this->_AS,sizeof(this->_AS));
X- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
X+ is.read((char *)&this->_ipAddr,sizeof(this->_ipAddr));
X return(is);
X }
X
X@@ -166,7 +166,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4AggregatorAttribute::read(int fd, uint8_t version = 0)
X+int ArtsBgp4AggregatorAttribute::read(int fd, uint8_t version)
X {
X int rc;
X int bytesRead = 0;
X@@ -190,10 +190,10 @@
X //
X //----------------------------------------------------------------------------
X ostream & ArtsBgp4AggregatorAttribute::write(ostream & os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X g_ArtsLibInternal_Primitive.WriteUint16(os,this->_AS,sizeof(this->_AS));
X- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
X+ os.write((char *)&this->_ipAddr,sizeof(this->_ipAddr));
X return(os);
X }
X
X@@ -202,7 +202,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4AggregatorAttribute::write(int fd, uint8_t version = 0) const
X+int ArtsBgp4AggregatorAttribute::write(int fd, uint8_t version) const
X {
X int rc;
X int bytesWritten = 0;
X@@ -225,7 +225,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-uint32_t ArtsBgp4AggregatorAttribute::Length(uint8_t version = 0) const
X+uint32_t ArtsBgp4AggregatorAttribute::Length(uint8_t version) const
X {
X return(sizeof(this->_AS) + sizeof(this->_ipAddr));
X }
X--- ./classes/src/ArtsBgp4AsPathAttribute.cc.orig Mon Oct 2 13:05:22 2000
X+++ ./classes/src/ArtsBgp4AsPathAttribute.cc Sun Sep 8 04:03:22 2002
X@@ -117,7 +117,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-istream & ArtsBgp4AsPathAttribute::read(istream & is, uint8_t version = 0)
X+istream & ArtsBgp4AsPathAttribute::read(istream & is, uint8_t version)
X {
X ArtsBgp4AsPathSegment asPathSegment;
X uint8_t numSegments;
X@@ -125,7 +125,7 @@
X if (this->_segments.size() > 0)
X this->_segments.erase(this->_segments.begin(),this->_segments.end());
X
X- is.read(&numSegments,sizeof(numSegments));
X+ is.read((char *)&numSegments,sizeof(numSegments));
X if (numSegments > 0) {
X this->_segments.reserve(numSegments);
X for (uint8_t segmentNum = 0; segmentNum < numSegments; segmentNum++) {
X@@ -144,7 +144,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4AsPathAttribute::read(int fd, uint8_t version = 0)
X+int ArtsBgp4AsPathAttribute::read(int fd, uint8_t version)
X {
X int rc;
X int bytesRead = 0;
X@@ -175,10 +175,10 @@
X //
X //----------------------------------------------------------------------------
X ostream & ArtsBgp4AsPathAttribute::write(ostream & os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t numSegments = this->_segments.size();
X- os.write(&numSegments,sizeof(numSegments));
X+ os.write((char *)&numSegments,sizeof(numSegments));
X for (uint8_t segmentNum = 0; segmentNum < numSegments; segmentNum++) {
X this->_segments[segmentNum].write(os,version);
X }
X@@ -190,7 +190,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4AsPathAttribute::write(int fd, uint8_t version = 0) const
X+int ArtsBgp4AsPathAttribute::write(int fd, uint8_t version) const
X {
X int rc;
X int bytesWritten = 0;
X@@ -232,7 +232,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-uint32_t ArtsBgp4AsPathAttribute::Length(uint8_t version = 0) const
X+uint32_t ArtsBgp4AsPathAttribute::Length(uint8_t version) const
X {
X uint32_t length = sizeof(uint8_t);
X
X--- ./classes/src/ArtsBgp4AsPathSegment.cc.orig Mon Oct 2 13:05:23 2000
X+++ ./classes/src/ArtsBgp4AsPathSegment.cc Sun Sep 8 04:03:22 2002
X@@ -137,13 +137,13 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-istream & ArtsBgp4AsPathSegment::read(istream & is, uint8_t version = 0)
X+istream & ArtsBgp4AsPathSegment::read(istream & is, uint8_t version)
X {
X uint8_t numAses;
X uint16_t as;
X
X- is.read(&this->_type,sizeof(this->_type));
X- is.read(&numAses,sizeof(numAses));
X+ is.read((char *)&this->_type,sizeof(this->_type));
X+ is.read((char *)&numAses,sizeof(numAses));
X if (numAses > 0) {
X this->_AS.reserve(numAses);
X for (int asNum = 0; asNum < numAses; asNum++) {
X@@ -160,7 +160,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4AsPathSegment::read(int fd, uint8_t version = 0)
X+int ArtsBgp4AsPathSegment::read(int fd, uint8_t version)
X {
X int rc;
X uint8_t numAses;
X@@ -196,12 +196,12 @@
X //
X //----------------------------------------------------------------------------
X ostream & ArtsBgp4AsPathSegment::write(ostream & os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X- os.write(&this->_type,sizeof(this->_type));
X+ os.write((char *)&this->_type,sizeof(this->_type));
X
X uint8_t numAses = this->_AS.size();
X- os.write(&numAses,sizeof(numAses));
X+ os.write((char *)&numAses,sizeof(numAses));
X
X for (int asNum = 0; asNum < numAses; asNum++) {
X g_ArtsLibInternal_Primitive.WriteUint16(os,this->_AS[asNum],
X@@ -215,7 +215,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4AsPathSegment::write(int fd, uint8_t version = 0) const
X+int ArtsBgp4AsPathSegment::write(int fd, uint8_t version) const
X {
X int rc;
X uint8_t numAses;
X@@ -246,7 +246,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-uint32_t ArtsBgp4AsPathSegment::Length(uint8_t version = 0) const
X+uint32_t ArtsBgp4AsPathSegment::Length(uint8_t version) const
X {
X return(sizeof(this->_type) + sizeof(uint8_t) +
X (sizeof(uint16_t) * this->_AS.size()));
X--- ./classes/src/ArtsBgp4Attribute.cc.orig Mon Oct 2 13:05:23 2000
X+++ ./classes/src/ArtsBgp4Attribute.cc Sun Sep 8 04:03:22 2002
X@@ -444,26 +444,26 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-istream & ArtsBgp4Attribute::read(istream & is, uint8_t version = 0)
X+istream & ArtsBgp4Attribute::read(istream & is, uint8_t version)
X {
X uint8_t numCommunities;
X uint32_t community;
X
X this->DeleteValue();
X
X- is.read(&this->_flags,sizeof(this->_flags));
X- is.read(&this->_type,sizeof(this->_type));
X+ is.read((char *)&this->_flags,sizeof(this->_flags));
X+ is.read((char *)&this->_type,sizeof(this->_type));
X
X switch (this->_type) {
X case Bgp4_Attribute_Origin:
X- is.read(&this->_value._origin,sizeof(this->_value._origin));
X+ is.read((char *)&this->_value._origin,sizeof(this->_value._origin));
X break;
X case Bgp4_Attribute_AsPath:
X this->_value._asPath = new ArtsBgp4AsPathAttribute;
X this->_value._asPath->read(is,version);
X break;
X case Bgp4_Attribute_NextHop:
X- is.read(&this->_value._nextHop,sizeof(this->_value._nextHop));
X+ is.read((char *)&this->_value._nextHop,sizeof(this->_value._nextHop));
X break;
X case Bgp4_Attribute_MultiExitDisc:
X g_ArtsLibInternal_Primitive.ReadUint32(is,this->_value._MED,
X@@ -480,7 +480,7 @@
X this->_value._aggregator->read(is,version);
X break;
X case Bgp4_Attribute_Community:
X- is.read(&numCommunities,sizeof(numCommunities));
X+ is.read((char *)&numCommunities,sizeof(numCommunities));
X this->_value._community = new vector<uint32_t>;
X this->_value._community->reserve((int)numCommunities);
X for (int commNum = 0; commNum < numCommunities; commNum++) {
X@@ -507,7 +507,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4Attribute::read(int fd, uint8_t version = 0)
X+int ArtsBgp4Attribute::read(int fd, uint8_t version)
X {
X uint8_t numCommunities;
X uint32_t community;
X@@ -622,22 +622,22 @@
X //
X //----------------------------------------------------------------------------
X ostream & ArtsBgp4Attribute::write(ostream & os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t numCommunities;
X
X- os.write(&this->_flags,sizeof(this->_flags));
X- os.write(&this->_type,sizeof(this->_type));
X+ os.write((char *)&this->_flags,sizeof(this->_flags));
X+ os.write((char *)&this->_type,sizeof(this->_type));
X
X switch (this->_type) {
X case Bgp4_Attribute_Origin:
X- os.write(&this->_value._origin,sizeof(this->_value._origin));
X+ os.write((char *)&this->_value._origin,sizeof(this->_value._origin));
X break;
X case Bgp4_Attribute_AsPath:
X this->_value._asPath->write(os,version);
X break;
X case Bgp4_Attribute_NextHop:
X- os.write(&this->_value._nextHop,sizeof(this->_value._nextHop));
X+ os.write((char *)&this->_value._nextHop,sizeof(this->_value._nextHop));
X break;
X case Bgp4_Attribute_MultiExitDisc:
X g_ArtsLibInternal_Primitive.WriteUint32(os,this->_value._MED,
X@@ -654,7 +654,7 @@
X break;
X case Bgp4_Attribute_Community:
X numCommunities = this->_value._community->size();
X- os.write(&numCommunities,sizeof(numCommunities));
X+ os.write((char *)&numCommunities,sizeof(numCommunities));
X for (int commNum = 0; commNum < numCommunities; commNum++) {
X g_ArtsLibInternal_Primitive.WriteUint32(os,
X (*(this->_value._community))[commNum],
X@@ -680,7 +680,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4Attribute::write(int fd, uint8_t version = 0) const
X+int ArtsBgp4Attribute::write(int fd, uint8_t version) const
X {
X uint8_t numCommunities;
X int rc;
X@@ -855,7 +855,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-uint16_t ArtsBgp4Attribute::Length(uint8_t version = 0) const
X+uint16_t ArtsBgp4Attribute::Length(uint8_t version) const
X {
X uint16_t length = sizeof(this->_flags) + sizeof(this->_type);
X switch (this->_type) {
X--- ./classes/src/ArtsBgp4DPAttribute.cc.orig Mon Oct 2 13:05:23 2000
X+++ ./classes/src/ArtsBgp4DPAttribute.cc Sun Sep 8 04:03:22 2002
X@@ -132,7 +132,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-istream & ArtsBgp4DPAttribute::read(istream & is, uint8_t version = 0)
X+istream & ArtsBgp4DPAttribute::read(istream & is, uint8_t version)
X {
X g_ArtsLibInternal_Primitive.ReadUint16(is,this->_as,sizeof(this->_as));
X g_ArtsLibInternal_Primitive.ReadUint32(is,this->_value,
X@@ -145,7 +145,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4DPAttribute::read(int fd, uint8_t version = 0)
X+int ArtsBgp4DPAttribute::read(int fd, uint8_t version)
X {
X int rc;
X int bytesRead = 0;
X@@ -169,7 +169,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-ostream & ArtsBgp4DPAttribute::write(ostream & os, uint8_t version = 0) const
X+ostream & ArtsBgp4DPAttribute::write(ostream & os, uint8_t version) const
X {
X g_ArtsLibInternal_Primitive.WriteUint16(os,this->_as,sizeof(this->_as));
X g_ArtsLibInternal_Primitive.WriteUint32(os,this->_value,
X@@ -182,7 +182,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4DPAttribute::write(int fd, uint8_t version = 0) const
X+int ArtsBgp4DPAttribute::write(int fd, uint8_t version) const
X {
X int rc;
X int bytesWritten = 0;
X--- ./classes/src/ArtsBgp4Prefix.cc.orig Mon Oct 2 13:05:23 2000
X+++ ./classes/src/ArtsBgp4Prefix.cc Sun Sep 8 04:03:22 2002
X@@ -48,7 +48,7 @@
X
X #include "ArtsBgp4Prefix.hh"
X
X-static const string rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsBgp4Prefix.cc,v 1.4 2000/10/02 17:05:23 dwm Exp $";
X+static const char *rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsBgp4Prefix.cc,v 1.4 2000/10/02 17:05:23 dwm Exp $";
X
X //-------------------------------------------------------------------------
X // uint8_t ArtsBgp4Prefix::AddressFamily() const
X--- ./classes/src/ArtsBgp4RouteEntry.cc.orig Mon Oct 2 13:05:23 2000
X+++ ./classes/src/ArtsBgp4RouteEntry.cc Sun Sep 8 04:03:22 2002
X@@ -122,7 +122,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-istream & ArtsBgp4RouteEntry::read(istream & is, uint8_t version = 0)
X+istream & ArtsBgp4RouteEntry::read(istream & is, uint8_t version)
X {
X ArtsBgp4Attribute bgp4Attribute;
X
X@@ -186,7 +186,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4RouteEntry::read(int fd, uint8_t version = 0)
X+int ArtsBgp4RouteEntry::read(int fd, uint8_t version)
X {
X int rc;
X ArtsBgp4Attribute bgp4Attribute;
X@@ -291,7 +291,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-ostream & ArtsBgp4RouteEntry::write(ostream & os, uint8_t version = 0) const
X+ostream & ArtsBgp4RouteEntry::write(ostream & os, uint8_t version) const
X {
X g_ArtsLibInternal_Primitive.WriteUint32(os,this->_attrIndex,
X sizeof(this->_attrIndex));
X@@ -309,7 +309,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4RouteEntry::write(int fd, uint8_t version = 0) const
X+int ArtsBgp4RouteEntry::write(int fd, uint8_t version) const
X {
X int rc;
X int bytesWritten = 0;
X@@ -337,7 +337,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-uint32_t ArtsBgp4RouteEntry::Length(uint8_t version = 0) const
X+uint32_t ArtsBgp4RouteEntry::Length(uint8_t version) const
X {
X uint32_t length = sizeof(this->_attrIndex);
X vector<ArtsBgp4Attribute>::const_iterator bgp4AttrIter;
X--- ./classes/src/ArtsBgp4RouteTableData.cc.orig Mon Oct 2 13:05:23 2000
X+++ ./classes/src/ArtsBgp4RouteTableData.cc Sun Sep 8 04:03:22 2002
X@@ -114,7 +114,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-istream & ArtsBgp4RouteTableData::read(istream & is, uint8_t version = 0)
X+istream & ArtsBgp4RouteTableData::read(istream & is, uint8_t version)
X {
X uint32_t numRoutes;
X ArtsBgp4RouteEntry routeEntry;
X@@ -134,7 +134,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4RouteTableData::read(int fd, uint8_t version = 0)
X+int ArtsBgp4RouteTableData::read(int fd, uint8_t version)
X {
X uint32_t numRoutes;
X ArtsBgp4RouteEntry routeEntry;
X@@ -165,7 +165,7 @@
X //
X //----------------------------------------------------------------------------
X ostream & ArtsBgp4RouteTableData::write(ostream & os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
X
X@@ -185,7 +185,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsBgp4RouteTableData::write(int fd, uint8_t version = 0) const
X+int ArtsBgp4RouteTableData::write(int fd, uint8_t version) const
X {
X Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
X int rc;
X@@ -216,7 +216,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-uint32_t ArtsBgp4RouteTableData::Length(uint8_t version = 0) const
X+uint32_t ArtsBgp4RouteTableData::Length(uint8_t version) const
X {
X uint32_t length = sizeof(uint32_t);
X Ipv4PrefixPatricia<ArtsBgp4RouteEntry>::iterator routeIter;
X--- ./classes/src/ArtsBitString.cc.orig Mon Oct 2 13:05:23 2000
X+++ ./classes/src/ArtsBitString.cc Sun Sep 8 04:03:22 2002
X@@ -48,7 +48,7 @@
X
X #include "ArtsBitString.hh"
X
X-static const string rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsBitString.cc,v 1.7 2000/10/02 17:05:23 dwm Exp $";
X+static const char *rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsBitString.cc,v 1.7 2000/10/02 17:05:23 dwm Exp $";
X
X //-------------------------------------------------------------------------
X // ArtsBitString::ArtsBitString(uint32_t numBits)
X--- ./classes/src/ArtsFileUtil.cc.orig Mon Oct 2 13:05:24 2000
X+++ ./classes/src/ArtsFileUtil.cc Sun Sep 8 04:03:22 2002
X@@ -53,6 +53,7 @@
X
X #ifdef HAVE_FSTREAM
X #include <fstream>
X+ #include <iterator>
X #else
X #include <fstream.h>
X #endif
X@@ -69,7 +70,7 @@
X extern char *tzname[2];
X extern int errno;
X
X-const string rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsFileUtil.cc,v 1.14 2000/10/02 17:05:24 dwm Exp $";
X+const char *rcsid = "@(#) $Name: arts++-1-1-a8 $ $Id: ArtsFileUtil.cc,v 1.14 2000/10/02 17:05:24 dwm Exp $";
X static const ArtsPackageVersion k_artsVersion = ArtsPackageVersion(rcsid);
X
X //----------------------------------------------------------------------------
X--- ./classes/src/ArtsIfIndexSelectionSet.lex.orig Mon Oct 2 13:05:24 2000
X+++ ./classes/src/ArtsIfIndexSelectionSet.lex Sun Sep 8 04:03:22 2002
X@@ -48,6 +48,7 @@
X }
X
X #include <string>
X+using namespace std;
X
X #ifdef HAVE_STRSTREAM
X #include <strstream>
X--- ./classes/src/ArtsInterfaceMatrixEntry.cc.orig Mon Oct 2 13:05:25 2000
X+++ ./classes/src/ArtsInterfaceMatrixEntry.cc Sun Sep 8 04:03:22 2002
X@@ -214,7 +214,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsInterfaceMatrixEntry::Length(uint8_t version = 0) const
X+uint32_t ArtsInterfaceMatrixEntry::Length(uint8_t version) const
X {
X uint32_t length;
X length = (sizeof(this->_descriptor) +
X@@ -231,11 +231,11 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream & ArtsInterfaceMatrixEntry::read(istream& is, uint8_t version = 0)
X+istream & ArtsInterfaceMatrixEntry::read(istream& is, uint8_t version)
X {
X uint8_t bytesize, pktsize, srcsize, dstsize;
X
X- is.read(&this->_descriptor,sizeof(this->_descriptor));
X+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X srcsize = (this->_descriptor & 0x01) + 1;
X dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
X@@ -255,7 +255,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsInterfaceMatrixEntry::read(int fd, uint8_t version = 0)
X+int ArtsInterfaceMatrixEntry::read(int fd, uint8_t version)
X {
X uint8_t bytesize, pktsize, srcsize, dstsize;
X int rc;
X@@ -307,11 +307,11 @@
X //
X //-------------------------------------------------------------------------
X ostream & ArtsInterfaceMatrixEntry::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t bytesize, pktsize, srcsize, dstsize;
X
X- os.write(&this->_descriptor,sizeof(this->_descriptor));
X+ os.write((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X srcsize = (this->_descriptor & 0x01) + 1;
X dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
X@@ -331,7 +331,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsInterfaceMatrixEntry::write(int fd, uint8_t version = 0) const
X+int ArtsInterfaceMatrixEntry::write(int fd, uint8_t version) const
X {
X uint8_t bytesize, pktsize, srcsize, dstsize;
X int rc;
X--- ./classes/src/ArtsInterfaceMatrixData.cc.orig Mon Oct 2 13:05:24 2000
X+++ ./classes/src/ArtsInterfaceMatrixData.cc Sun Sep 8 04:03:22 2002
X@@ -81,7 +81,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream & ArtsInterfaceMatrixData::read(istream& is, uint8_t version = 0)
X+istream & ArtsInterfaceMatrixData::read(istream& is, uint8_t version)
X {
X uint32_t entryNum;
X ArtsInterfaceMatrixEntry interfaceEntry;
X@@ -106,7 +106,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsInterfaceMatrixData::read(int fd, uint8_t version = 0)
X+int ArtsInterfaceMatrixData::read(int fd, uint8_t version)
X {
X uint32_t entryNum;
X // ArtsPrimitive ioHelper;
X@@ -163,7 +163,7 @@
X //
X //-------------------------------------------------------------------------
X ostream & ArtsInterfaceMatrixData::write(ostream& os,
X- uint8_t version = 0)
X+ uint8_t version)
X {
X uint32_t entryNum;
X
X@@ -185,7 +185,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsInterfaceMatrixData::write(int fd, uint8_t version = 0)
X+int ArtsInterfaceMatrixData::write(int fd, uint8_t version)
X {
X uint32_t entryNum;
X int rc;
X@@ -237,7 +237,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsInterfaceMatrixData::Length(uint8_t version = 0) const
X+uint32_t ArtsInterfaceMatrixData::Length(uint8_t version) const
X {
X uint32_t length = 0;
X
X--- ./classes/src/ArtsInterfaceMatrixAggregatorMap.cc.orig Mon Oct 2 13:05:24 2000
X+++ ./classes/src/ArtsInterfaceMatrixAggregatorMap.cc Sun Sep 8 04:03:22 2002
X@@ -46,7 +46,9 @@
X
X #include <string>
X #ifdef HAVE_FSTREAM
X- #include <fstream>
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X #else
X #include <fstream.h>
X #endif
X--- ./classes/src/ArtsNetMatrixEntry.cc.orig Mon Oct 2 13:05:25 2000
X+++ ./classes/src/ArtsNetMatrixEntry.cc Sun Sep 8 04:03:22 2002
X@@ -186,7 +186,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsNetMatrixEntry::Length(uint8_t version = 2) const
X+uint32_t ArtsNetMatrixEntry::Length(uint8_t version) const
X {
X uint32_t length;
X
X@@ -203,7 +203,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream& ArtsNetMatrixEntry::read(istream& is, uint8_t version = 2)
X+istream& ArtsNetMatrixEntry::read(istream& is, uint8_t version)
X {
X uint8_t bytesize,
X pktsize,
X@@ -212,7 +212,7 @@
X dstsize,
X dstmasklen;
X
X- is.read(&this->_descriptor,sizeof(this->_descriptor));
X+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
X this->_descriptor = ntohs(this->_descriptor);
X
X srcmasklen = ((this->_descriptor >> 5) & 0x1f) + 1;
X@@ -237,7 +237,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsNetMatrixEntry::read(int fd, uint8_t version = 2)
X+int ArtsNetMatrixEntry::read(int fd, uint8_t version)
X {
X uint8_t bytesize,
X pktsize,
X@@ -298,7 +298,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-ostream & ArtsNetMatrixEntry::write(ostream & os, uint8_t version = 2) const
X+ostream & ArtsNetMatrixEntry::write(ostream & os, uint8_t version) const
X {
X uint8_t bytesize,
X pktsize,
X@@ -309,7 +309,7 @@
X uint16_t tmpDescriptor;
X
X tmpDescriptor = htons(this->_descriptor);
X- os.write(&tmpDescriptor,sizeof(tmpDescriptor));
X+ os.write((char *)&tmpDescriptor,sizeof(tmpDescriptor));
X
X srcmasklen = ((this->_descriptor >> 5) & 0x1f) + 1;
X srcsize = (srcmasklen + 7) / 8;
X@@ -333,7 +333,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsNetMatrixEntry::write(int fd, uint8_t version = 2) const
X+int ArtsNetMatrixEntry::write(int fd, uint8_t version) const
X {
X uint8_t bytesize,
X pktsize,
X--- ./classes/src/ArtsNetMatrixData.cc.orig Mon Oct 2 13:05:25 2000
X+++ ./classes/src/ArtsNetMatrixData.cc Sun Sep 8 04:03:22 2002
X@@ -83,7 +83,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream & ArtsNetMatrixData::read(istream& is, uint8_t version = 2)
X+istream & ArtsNetMatrixData::read(istream& is, uint8_t version)
X {
X uint32_t entryNum;
X ArtsNetMatrixEntry netEntry;
X@@ -108,7 +108,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsNetMatrixData::read(int fd, uint8_t version = 2)
X+int ArtsNetMatrixData::read(int fd, uint8_t version)
X {
X uint32_t entryNum;
X ArtsNetMatrixEntry netEntry;
X@@ -163,7 +163,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-ostream & ArtsNetMatrixData::write(ostream& os, uint8_t version = 2)
X+ostream & ArtsNetMatrixData::write(ostream& os, uint8_t version)
X {
X uint32_t entryNum;
X
X@@ -185,7 +185,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsNetMatrixData::write(int fd, uint8_t version = 2)
X+int ArtsNetMatrixData::write(int fd, uint8_t version)
X {
X uint32_t entryNum;
X int rc;
X@@ -237,7 +237,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsNetMatrixData::Length(uint8_t version = 2) const
X+uint32_t ArtsNetMatrixData::Length(uint8_t version) const
X {
X uint32_t length = 0;
X
X--- ./classes/src/ArtsNextHopTableEntry.cc.orig Mon Oct 2 13:05:26 2000
X+++ ./classes/src/ArtsNextHopTableEntry.cc Sun Sep 8 04:03:22 2002
X@@ -192,7 +192,7 @@
X //-------------------------------------------------------------------------
X // uint32_t ArtsNextHopTableEntry::Length(uint8_t version = 0) const
X //-------------------------------------------------------------------------
X-uint32_t ArtsNextHopTableEntry::Length(uint8_t version = 0) const
X+uint32_t ArtsNextHopTableEntry::Length(uint8_t version) const
X {
X uint32_t len = 0;
X
X@@ -207,15 +207,15 @@
X //-------------------------------------------------------------------------
X // istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version = 0)
X //-------------------------------------------------------------------------
X-istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version = 0)
X+istream& ArtsNextHopTableEntry::read(istream& is, uint8_t version)
X {
X uint8_t fieldLen;
X
X // IP address
X- is.read(&this->_ipAddr,sizeof(this->_ipAddr));
X+ is.read((char *)&this->_ipAddr,sizeof(this->_ipAddr));
X
X // descriptor
X- is.read(&this->_descriptor,sizeof(this->_descriptor));
X+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X // pkts
X fieldLen = (this->_descriptor >> 3) + 1;
X@@ -231,7 +231,7 @@
X //-------------------------------------------------------------------------
X // int ArtsNextHopTableEntry::read(int fd, uint8_t version = 0)
X //-------------------------------------------------------------------------
X-int ArtsNextHopTableEntry::read(int fd, uint8_t version = 0)
X+int ArtsNextHopTableEntry::read(int fd, uint8_t version)
X {
X uint8_t fieldLen;
X int rc = 0;
X@@ -262,15 +262,15 @@
X // uint8_t version = 0) const
X //-------------------------------------------------------------------------
X ostream& ArtsNextHopTableEntry::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t fieldLen;
X
X // IP address
X- os.write(&this->_ipAddr,sizeof(this->_ipAddr));
X+ os.write((char *)&this->_ipAddr,sizeof(this->_ipAddr));
X
X // descriptor
X- os.write(&this->_descriptor,1);
X+ os.write((char *)&this->_descriptor,1);
X
X // pkts
X fieldLen = (this->_descriptor >> 3) + 1;
X@@ -286,7 +286,7 @@
X //-------------------------------------------------------------------------
X // int ArtsNextHopTableEntry::write(int fd, uint8_t version = 0) const
X //-------------------------------------------------------------------------
X-int ArtsNextHopTableEntry::write(int fd, uint8_t version = 0) const
X+int ArtsNextHopTableEntry::write(int fd, uint8_t version) const
X {
X uint8_t fieldLen;
X int rc = 0;
X--- ./classes/src/ArtsNextHopTableData.cc.orig Mon Oct 2 13:05:26 2000
X+++ ./classes/src/ArtsNextHopTableData.cc Sun Sep 8 04:03:23 2002
X@@ -182,7 +182,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsNextHopTableData::ComputeLength(uint8_t version = 0) const
X+uint32_t ArtsNextHopTableData::ComputeLength(uint8_t version) const
X {
X this->_length = 0;
X
X@@ -205,7 +205,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsNextHopTableData::Length(uint8_t version = 0) const
X+uint32_t ArtsNextHopTableData::Length(uint8_t version) const
X {
X this->ComputeLength(version);
X return(this->_length);
X@@ -216,7 +216,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream& ArtsNextHopTableData::read(istream& is, uint8_t version = 0)
X+istream& ArtsNextHopTableData::read(istream& is, uint8_t version)
X {
X uint32_t numNextHops;
X uint32_t NextHopNum;
X@@ -239,7 +239,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsNextHopTableData::read(int fd, uint8_t version = 0)
X+int ArtsNextHopTableData::read(int fd, uint8_t version)
X {
X uint32_t numNextHops;
X uint32_t NextHopNum;
X@@ -281,7 +281,7 @@
X //
X //-------------------------------------------------------------------------
X ostream& ArtsNextHopTableData::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint32_t numNextHops;
X
X@@ -306,7 +306,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsNextHopTableData::write(int fd, uint8_t version = 0) const
X+int ArtsNextHopTableData::write(int fd, uint8_t version) const
X {
X uint32_t numNextHops;
X int rc;
X--- ./classes/src/ArtsPortChoice.cc.orig Mon Oct 2 13:05:26 2000
X+++ ./classes/src/ArtsPortChoice.cc Sun Sep 8 04:03:23 2002
X@@ -293,7 +293,7 @@
X {
X uint8_t portLength;
X
X- is.read(&this->_flags,sizeof(this->_flags));
X+ is.read((char *)&this->_flags,sizeof(this->_flags));
X if (!is)
X return(is);
X
X@@ -364,7 +364,7 @@
X {
X uint8_t portLength;
X
X- os.write(&this->_flags,sizeof(this->_flags));
X+ os.write((char *)&this->_flags,sizeof(this->_flags));
X
X portLength = 1;
X if (this->_flags & this->k_firstPortLengthMask)
X--- ./classes/src/ArtsPortChooser.lex.orig Mon Oct 2 13:05:27 2000
X+++ ./classes/src/ArtsPortChooser.lex Sun Sep 8 04:03:23 2002
X@@ -233,7 +233,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsPortChooser::Length(uint8_t version = 0) const
X+uint32_t ArtsPortChooser::Length(uint8_t version) const
X {
X uint32_t length = 0;
X vector<ArtsPortChoice>::const_iterator choiceIter;
X--- ./classes/src/ArtsPortMatrixAggregator.cc.orig Mon Oct 2 13:05:27 2000
X+++ ./classes/src/ArtsPortMatrixAggregator.cc Sun Sep 8 04:03:23 2002
X@@ -327,7 +327,7 @@
X //----------------------------------------------------------------------------
X ArtsSelectedPortTable *
X ArtsPortMatrixAggregator::
X-ConvertToArtsSelectedPortTable(int numTopPorts, bool byPkts = false) const
X+ConvertToArtsSelectedPortTable(int numTopPorts, bool byPkts) const
X {
X ArtsPortTableEntry portEntry;
X map<ArtsPortMatrixKeyValue,counter_t,less<ArtsPortMatrixKeyValue> >::const_iterator portCounter;
X--- ./classes/src/ArtsPortMatrixAggregatorMap.cc.orig Mon Oct 2 13:05:27 2000
X+++ ./classes/src/ArtsPortMatrixAggregatorMap.cc Sun Sep 8 04:03:23 2002
X@@ -46,9 +46,11 @@
X
X #include <string>
X #ifdef HAVE_FSTREAM
X- #include <fstream>
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X #else
X- #include <fstream.h>
X+# include <fstream.h>
X #endif
X
X #include "ArtsPortMatrixAggregatorMap.hh"
X--- ./classes/src/ArtsPortMatrixEntry.cc.orig Mon Oct 2 13:05:27 2000
X+++ ./classes/src/ArtsPortMatrixEntry.cc Sun Sep 8 04:03:23 2002
X@@ -176,7 +176,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsPortMatrixEntry::Length(uint8_t version = 0) const
X+uint32_t ArtsPortMatrixEntry::Length(uint8_t version) const
X {
X uint32_t length;
X
X@@ -189,18 +189,18 @@
X }
X
X //-------------------------------------------------------------------------
X-// istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version = 0)
X+// istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version)
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version = 0)
X+istream& ArtsPortMatrixEntry::read(istream& is, uint8_t version)
X {
X uint8_t bytesize,
X pktsize,
X srcsize,
X dstsize;
X
X- is.read(&this->_descriptor,sizeof(this->_descriptor));
X+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X srcsize = (this->_descriptor & 0x01) + 1;
X dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
X@@ -220,7 +220,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsPortMatrixEntry::read(int fd, uint8_t version = 0)
X+int ArtsPortMatrixEntry::read(int fd, uint8_t version)
X {
X uint8_t bytesize,
X pktsize,
X@@ -273,14 +273,14 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-ostream & ArtsPortMatrixEntry::write(ostream & os, uint8_t version = 0) const
X+ostream & ArtsPortMatrixEntry::write(ostream & os, uint8_t version) const
X {
X uint8_t bytesize,
X pktsize,
X srcsize,
X dstsize;
X
X- os.write(&this->_descriptor,sizeof(this->_descriptor));
X+ os.write((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X srcsize = (this->_descriptor & 0x01) + 1;
X dstsize = ((this->_descriptor >> 1) & 0x01) + 1;
X@@ -300,7 +300,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsPortMatrixEntry::write(int fd, uint8_t version = 0) const
X+int ArtsPortMatrixEntry::write(int fd, uint8_t version) const
X {
X uint8_t bytesize,
X pktsize,
X--- ./classes/src/ArtsPortMatrixData.cc.orig Mon Oct 2 13:05:27 2000
X+++ ./classes/src/ArtsPortMatrixData.cc Sun Sep 8 04:03:23 2002
X@@ -82,7 +82,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream & ArtsPortMatrixData::read(istream& is, uint8_t version = 0)
X+istream & ArtsPortMatrixData::read(istream& is, uint8_t version)
X {
X uint32_t entryNum;
X ArtsPortMatrixEntry portEntry;
X@@ -107,7 +107,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsPortMatrixData::read(int fd, uint8_t version = 0)
X+int ArtsPortMatrixData::read(int fd, uint8_t version)
X {
X uint32_t entryNum;
X ArtsPortMatrixEntry portEntry;
X@@ -162,7 +162,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-ostream & ArtsPortMatrixData::write(ostream& os, uint8_t version = 0)
X+ostream & ArtsPortMatrixData::write(ostream& os, uint8_t version)
X {
X uint32_t entryNum;
X
X@@ -180,11 +180,11 @@
X }
X
X //-------------------------------------------------------------------------
X-// int ArtsPortMatrixData::write(int fd, uint8_t version = 0)
X+// int ArtsPortMatrixData::write(int fd, uint8_t version)
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsPortMatrixData::write(int fd, uint8_t version = 0)
X+int ArtsPortMatrixData::write(int fd, uint8_t version)
X {
X uint32_t entryNum;
X int rc;
X@@ -236,7 +236,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsPortMatrixData::Length(uint8_t version = 0) const
X+uint32_t ArtsPortMatrixData::Length(uint8_t version) const
X {
X uint32_t length = 0;
X
X--- ./classes/src/ArtsPortTableEntry.cc.orig Mon Oct 2 13:05:28 2000
X+++ ./classes/src/ArtsPortTableEntry.cc Sun Sep 8 04:03:23 2002
X@@ -332,7 +332,7 @@
X //-------------------------------------------------------------------------
X // uint32_t ArtsPortTableEntry::Length(uint8_t version = 0) const
X //-------------------------------------------------------------------------
X-uint32_t ArtsPortTableEntry::Length(uint8_t version = 0) const
X+uint32_t ArtsPortTableEntry::Length(uint8_t version) const
X {
X uint32_t len = 0;
X
X@@ -349,7 +349,7 @@
X //-------------------------------------------------------------------------
X // istream& ArtsPortTableEntry::read(istream& is, uint8_t version = 0)
X //-------------------------------------------------------------------------
X-istream& ArtsPortTableEntry::read(istream& is, uint8_t version = 0)
X+istream& ArtsPortTableEntry::read(istream& is, uint8_t version)
X {
X uint8_t fieldLen;
X
X@@ -358,7 +358,7 @@
X sizeof(this->_portNum));
X
X // descriptor
X- is.read(&this->_descriptor,sizeof(this->_descriptor));
X+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X // inPkts
X fieldLen = 1 << (this->_descriptor >> 6);
X@@ -382,7 +382,7 @@
X //-------------------------------------------------------------------------
X // int ArtsPortTableEntry::read(int fd, uint8_t version = 0)
X //-------------------------------------------------------------------------
X-int ArtsPortTableEntry::read(int fd, uint8_t version = 0)
X+int ArtsPortTableEntry::read(int fd, uint8_t version)
X {
X uint8_t fieldLen;
X int rc = 0;
X@@ -421,7 +421,7 @@
X // uint8_t version = 0) const
X //-------------------------------------------------------------------------
X ostream& ArtsPortTableEntry::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t fieldLen;
X
X@@ -430,7 +430,7 @@
X sizeof(this->_portNum));
X
X // descriptor
X- os.write(&this->_descriptor,1);
X+ os.write((char *)&this->_descriptor,1);
X
X // inPkts
X fieldLen = 1 << (this->_descriptor >> 6);
X@@ -454,7 +454,7 @@
X //-------------------------------------------------------------------------
X // int ArtsPortTableEntry::write(int fd, uint8_t version = 0) const
X //-------------------------------------------------------------------------
X-int ArtsPortTableEntry::write(int fd, uint8_t version = 0) const
X+int ArtsPortTableEntry::write(int fd, uint8_t version) const
X {
X uint8_t fieldLen;
X int rc = 0;
X--- ./classes/src/ArtsPortTableData.cc.orig Mon Oct 2 13:05:28 2000
X+++ ./classes/src/ArtsPortTableData.cc Sun Sep 8 04:03:23 2002
X@@ -182,7 +182,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsPortTableData::ComputeLength(uint8_t version = 0) const
X+uint32_t ArtsPortTableData::ComputeLength(uint8_t version) const
X {
X this->_length = 0;
X
X@@ -205,7 +205,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsPortTableData::Length(uint8_t version = 0) const
X+uint32_t ArtsPortTableData::Length(uint8_t version) const
X {
X this->ComputeLength(version);
X return(this->_length);
X@@ -216,7 +216,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream& ArtsPortTableData::read(istream& is, uint8_t version = 0)
X+istream& ArtsPortTableData::read(istream& is, uint8_t version)
X {
X uint32_t numPorts;
X uint32_t portNum;
X@@ -239,7 +239,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsPortTableData::read(int fd, uint8_t version = 0)
X+int ArtsPortTableData::read(int fd, uint8_t version)
X {
X uint32_t numPorts;
X uint32_t portNum;
X@@ -281,7 +281,7 @@
X //
X //-------------------------------------------------------------------------
X ostream& ArtsPortTableData::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint32_t numPorts;
X vector<ArtsPortTableEntry>::const_iterator portEntry;
X@@ -305,7 +305,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsPortTableData::write(int fd, uint8_t version = 0) const
X+int ArtsPortTableData::write(int fd, uint8_t version) const
X {
X uint32_t numPorts;
X int rc;
X--- ./classes/src/ArtsProtocolTableEntry.cc.orig Mon Oct 2 13:05:28 2000
X+++ ./classes/src/ArtsProtocolTableEntry.cc Sun Sep 8 04:03:23 2002
X@@ -189,7 +189,7 @@
X //-------------------------------------------------------------------------
X // uint32_t ArtsProtocolTableEntry::Length(uint8_t version = 0) const
X //-------------------------------------------------------------------------
X-uint32_t ArtsProtocolTableEntry::Length(uint8_t version = 0) const
X+uint32_t ArtsProtocolTableEntry::Length(uint8_t version) const
X {
X uint32_t len = 0;
X
X@@ -204,15 +204,15 @@
X //-------------------------------------------------------------------------
X // istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version = 0)
X //-------------------------------------------------------------------------
X-istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version = 0)
X+istream& ArtsProtocolTableEntry::read(istream& is, uint8_t version)
X {
X uint8_t fieldLen;
X
X // protocol number
X- is.read(&this->_protocolNum,sizeof(this->_protocolNum));
X+ is.read((char *)&this->_protocolNum,sizeof(this->_protocolNum));
X
X // descriptor
X- is.read(&this->_descriptor,sizeof(this->_descriptor));
X+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X // pkts
X fieldLen = (this->_descriptor >> 3) + 1;
X@@ -228,7 +228,7 @@
X //-------------------------------------------------------------------------
X // int ArtsProtocolTableEntry::read(int fd, uint8_t version = 0)
X //-------------------------------------------------------------------------
X-int ArtsProtocolTableEntry::read(int fd, uint8_t version = 0)
X+int ArtsProtocolTableEntry::read(int fd, uint8_t version)
X {
X uint8_t fieldLen;
X int rc = 0;
X@@ -259,15 +259,15 @@
X // uint8_t version = 0) const
X //-------------------------------------------------------------------------
X ostream& ArtsProtocolTableEntry::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t fieldLen;
X
X // protocol number
X- os.write(&this->_protocolNum,sizeof(this->_protocolNum));
X+ os.write((char *)&this->_protocolNum,sizeof(this->_protocolNum));
X
X // descriptor
X- os.write(&this->_descriptor,1);
X+ os.write((char *)&this->_descriptor,1);
X
X // pkts
X fieldLen = (this->_descriptor >> 3) + 1;
X@@ -283,7 +283,7 @@
X //-------------------------------------------------------------------------
X // int ArtsProtocolTableEntry::write(int fd, uint8_t version = 0) const
X //-------------------------------------------------------------------------
X-int ArtsProtocolTableEntry::write(int fd, uint8_t version = 0) const
X+int ArtsProtocolTableEntry::write(int fd, uint8_t version) const
X {
X uint8_t fieldLen;
X int rc = 0;
X--- ./classes/src/ArtsProtocolTableData.cc.orig Mon Oct 2 13:05:28 2000
X+++ ./classes/src/ArtsProtocolTableData.cc Sun Sep 8 04:03:23 2002
X@@ -182,7 +182,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsProtocolTableData::ComputeLength(uint8_t version = 0) const
X+uint32_t ArtsProtocolTableData::ComputeLength(uint8_t version) const
X {
X this->_length = 0;
X
X@@ -205,18 +205,18 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsProtocolTableData::Length(uint8_t version = 0) const
X+uint32_t ArtsProtocolTableData::Length(uint8_t version) const
X {
X this->ComputeLength(version);
X return(this->_length);
X }
X
X //-------------------------------------------------------------------------
X-// istream& ArtsProtocolTableData::read(istream& is, uint8_t version = 0)
X+// istream& ArtsProtocolTableData::read(istream& is, uint8_t version)
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream& ArtsProtocolTableData::read(istream& is, uint8_t version = 0)
X+istream& ArtsProtocolTableData::read(istream& is, uint8_t version)
X {
X uint32_t numProtocols;
X uint32_t protocolNum;
X@@ -239,7 +239,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsProtocolTableData::read(int fd, uint8_t version = 0)
X+int ArtsProtocolTableData::read(int fd, uint8_t version)
X {
X uint32_t numProtocols;
X uint32_t protocolNum;
X@@ -281,7 +281,7 @@
X //
X //-------------------------------------------------------------------------
X ostream& ArtsProtocolTableData::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint32_t numProtocols;
X
X@@ -306,7 +306,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsProtocolTableData::write(int fd, uint8_t version = 0) const
X+int ArtsProtocolTableData::write(int fd, uint8_t version) const
X {
X uint32_t numProtocols;
X int rc;
X--- ./classes/src/ArtsProtocolTableAggregatorMap.cc.orig Mon Oct 2 13:05:28 2000
X+++ ./classes/src/ArtsProtocolTableAggregatorMap.cc Sun Sep 8 04:03:23 2002
X@@ -46,9 +46,11 @@
X
X #include <string>
X #ifdef HAVE_FSTREAM
X- #include <fstream>
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X #else
X- #include <fstream.h>
X+# include <fstream.h>
X #endif
X
X #include "ArtsProtocolTableAggregatorMap.hh"
X--- ./classes/src/ArtsPrimitive.cc.orig Mon Oct 2 13:05:28 2000
X+++ ./classes/src/ArtsPrimitive.cc Sun Sep 8 04:03:23 2002
X@@ -150,11 +150,11 @@
X switch (len) {
X case 1:
X val8 = value;
X- os.write(&val8,sizeof(val8));
X+ os.write((char *)&val8,sizeof(val8));
X break;
X case 2:
X val16 = htons(value);
X- os.write(&val16,sizeof(val16));
X+ os.write((char *)&val16,sizeof(val16));
X break;
X default:
X #ifdef ARTS_DEBUG_DO_ASSERTIONS
X@@ -218,11 +218,11 @@
X
X switch (len) {
X case 1:
X- is.read(&val8,sizeof(val8));
X+ is.read((char *)&val8,sizeof(val8));
X value = val8;
X break;
X case 2:
X- is.read(&val16,sizeof(val16));
X+ is.read((char *)&val16,sizeof(val16));
X value = ntohs(val16);
X break;
X default:
X@@ -289,23 +289,23 @@
X switch (len) {
X case 1:
X val8 = value;
X- os.write(&val8,sizeof(val8));
X+ os.write((char *)&val8,sizeof(val8));
X break;
X case 2:
X val16 = value;
X val16 = htons(val16);
X- os.write(&val16,sizeof(val16));
X+ os.write((char *)&val16,sizeof(val16));
X break;
X case 3:
X val8 = (value >> 16);
X- os.write(&val8,sizeof(val8));
X+ os.write((char *)&val8,sizeof(val8));
X val16 = htons((value & 0x0000ffff));
X- os.write(&val16,sizeof(val16));
X+ os.write((char *)&val16,sizeof(val16));
X break;
X case 4:
X val32 = value;
X val32 = htonl(value);
X- os.write(&val32,sizeof(val32));
X+ os.write((char *)&val32,sizeof(val32));
X break;
X default:
X #ifdef ARTS_DEBUG_DO_ASSERTIONS
X@@ -384,21 +384,21 @@
X
X switch (len) {
X case 1:
X- is.read(&val8,sizeof(val8));
X+ is.read((char *)&val8,sizeof(val8));
X value = val8;
X break;
X case 2:
X- is.read(&val16,sizeof(val16));
X+ is.read((char *)&val16,sizeof(val16));
X value = ntohs(val16);
X break;
X case 3:
X- is.read(&val8,sizeof(val8));
X+ is.read((char *)&val8,sizeof(val8));
X value = ((uint32_t)val8) << 16;
X- is.read(&val16,sizeof(val16));
X+ is.read((char *)&val16,sizeof(val16));
X value |= ntohs(val16);
X break;
X case 4:
X- is.read(&val32,sizeof(val32));
X+ is.read((char *)&val32,sizeof(val32));
X value = ntohl(val32);
X break;
X default:
X@@ -483,22 +483,22 @@
X switch (len) {
X case 1:
X val8 = value;
X- os.write(&val8,sizeof(val8));
X+ os.write((char *)&val8,sizeof(val8));
X break;
X case 2:
X val16 = value;
X val16 = htons(val16);
X- os.write(&val16,sizeof(val16));
X+ os.write((char *)&val16,sizeof(val16));
X break;
X case 4:
X valuePart[0] = value;
X valuePart[0] = htonl(value);
X- os.write(&valuePart[0],sizeof(uint32_t));
X+ os.write((char *)&valuePart[0],sizeof(uint32_t));
X break;
X case 8:
X valuePart[0] = htonl(value >> 32);
X valuePart[1] = htonl(value & 0xffffffff);
X- os.write(valuePart,sizeof(valuePart));
X+ os.write((char *)valuePart,sizeof(valuePart));
X break;
X default:
X #ifdef ARTS_DEBUG_DO_ASSERTIONS
X@@ -575,19 +575,19 @@
X
X switch (len) {
X case 1:
X- is.read(&val8,sizeof(val8));
X+ is.read((char *)&val8,sizeof(val8));
X value = val8;
X break;
X case 2:
X- is.read(&val16,sizeof(val16));
X+ is.read((char *)&val16,sizeof(val16));
X value = ntohs(val16);
X break;
X case 4:
X- is.read(&valuePart[0],sizeof(uint32_t));
X+ is.read((char *)&valuePart[0],sizeof(uint32_t));
X value = ntohl(valuePart[0]);
X break;
X case 8:
X- is.read(valuePart,sizeof(valuePart));
X+ is.read((char *)valuePart,sizeof(valuePart));
X value = ((uint64_t)ntohl(valuePart[0])) << 32;
X value += ntohl(valuePart[1]);
X break;
X@@ -667,24 +667,24 @@
X
X switch (len) {
X case 1:
X- is.read(&octet1,sizeof(octet1));
X+ is.read((char *)&octet1,sizeof(octet1));
X value = htonl((ipv4addr_t)octet1 << 24);
X break;
X case 2:
X- is.read(&octet1,sizeof(octet1));
X- is.read(&octet2,sizeof(octet2));
X+ is.read((char *)&octet1,sizeof(octet1));
X+ is.read((char *)&octet2,sizeof(octet2));
X value = htonl(((ipv4addr_t)octet1 << 24) | ((ipv4addr_t)octet2 << 16));
X break;
X case 3:
X- is.read(&octet1,sizeof(octet1));
X- is.read(&octet2,sizeof(octet2));
X- is.read(&octet3,sizeof(octet3));
X+ is.read((char *)&octet1,sizeof(octet1));
X+ is.read((char *)&octet2,sizeof(octet2));
X+ is.read((char *)&octet3,sizeof(octet3));
X value = htonl(((ipv4addr_t)octet1 << 24) |
X ((ipv4addr_t)octet2 << 16) |
X ((ipv4addr_t)octet3 << 8));
X break;
X case 4:
X- is.read(&ipAddr,sizeof(ipAddr));
X+ is.read((char *)&ipAddr,sizeof(ipAddr));
X value = ipAddr;
X break;
X default:
X@@ -766,26 +766,26 @@
X switch (len) {
X case 1:
X octet1 = ntohl(value) >> 24;
X- os.write(&octet1,sizeof(octet1));
X+ os.write((char *)&octet1,sizeof(octet1));
X break;
X case 2:
X netaddr = ntohl(value);
X octet1 = (ipv4addr_t)(netaddr >> 24) & 0xff;
X octet2 = (ipv4addr_t)(netaddr >> 16) & 0xff;
X- os.write(&octet1,sizeof(octet1));
X- os.write(&octet2,sizeof(octet2));
X+ os.write((char *)&octet1,sizeof(octet1));
X+ os.write((char *)&octet2,sizeof(octet2));
X break;
X case 3:
X netaddr = ntohl(value);
X octet1 = (ipv4addr_t)(netaddr >> 24) & 0xff;
X octet2 = (ipv4addr_t)(netaddr >> 16) & 0xff;
X octet3 = (ipv4addr_t)(netaddr >> 8) & 0xff;
X- os.write(&octet1,sizeof(octet1));
X- os.write(&octet2,sizeof(octet2));
X- os.write(&octet3,sizeof(octet3));
X+ os.write((char *)&octet1,sizeof(octet1));
X+ os.write((char *)&octet2,sizeof(octet2));
X+ os.write((char *)&octet3,sizeof(octet3));
X break;
X case 4:
X- os.write(&value,4);
X+ os.write((char *)&value,4);
X break;
X default:
X #ifdef ARTS_DEBUG_DO_ASSERTIONS
X--- ./classes/src/ArtsSelectedPortTableData.cc.orig Mon Oct 2 13:05:29 2000
X+++ ./classes/src/ArtsSelectedPortTableData.cc Sun Sep 8 04:03:23 2002
X@@ -188,7 +188,7 @@
X //
X //-------------------------------------------------------------------------
X uint32_t
X-ArtsSelectedPortTableData::ComputeLength(uint8_t version = 0) const
X+ArtsSelectedPortTableData::ComputeLength(uint8_t version) const
X {
X this->_length = 0;
X
X@@ -214,7 +214,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsSelectedPortTableData::Length(uint8_t version = 0) const
X+uint32_t ArtsSelectedPortTableData::Length(uint8_t version) const
X {
X this->ComputeLength(version);
X return(this->_length);
X@@ -227,7 +227,7 @@
X //
X //-------------------------------------------------------------------------
X istream& ArtsSelectedPortTableData::read(istream& is,
X- uint8_t version = 0)
X+ uint8_t version)
X {
X uint32_t numPorts;
X uint32_t portNum;
X@@ -251,7 +251,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsSelectedPortTableData::read(int fd, uint8_t version = 0)
X+int ArtsSelectedPortTableData::read(int fd, uint8_t version)
X {
X uint32_t numPorts;
X uint32_t portNum;
X@@ -298,7 +298,7 @@
X //
X //-------------------------------------------------------------------------
X ostream& ArtsSelectedPortTableData::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint32_t numPorts;
X vector<ArtsPortTableEntry>::const_iterator portEntry;
X@@ -323,7 +323,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsSelectedPortTableData::write(int fd, uint8_t version = 0) const
X+int ArtsSelectedPortTableData::write(int fd, uint8_t version) const
X {
X uint32_t numPorts;
X int rc;
X--- ./classes/src/ArtsTosTableData.cc.orig Mon Oct 2 13:05:29 2000
X+++ ./classes/src/ArtsTosTableData.cc Sun Sep 8 04:03:23 2002
X@@ -166,7 +166,7 @@
X //-------------------------------------------------------------------------
X // uint32_t ArtsTosTableEntry::Length(uint8_t version = 0) const
X //-------------------------------------------------------------------------
X-uint32_t ArtsTosTableEntry::Length(uint8_t version = 0) const
X+uint32_t ArtsTosTableEntry::Length(uint8_t version) const
X {
X uint32_t len = 0;
X
X@@ -181,15 +181,15 @@
X //-------------------------------------------------------------------------
X // istream& ArtsTosTableEntry::read(istream& is, uint8_t version = 0)
X //-------------------------------------------------------------------------
X-istream& ArtsTosTableEntry::read(istream& is, uint8_t version = 0)
X+istream& ArtsTosTableEntry::read(istream& is, uint8_t version)
X {
X uint8_t fieldLen;
X
X // tos number
X- is.read(&this->_tosNum,sizeof(this->_tosNum));
X+ is.read((char *)&this->_tosNum,sizeof(this->_tosNum));
X
X // descriptor
X- is.read(&this->_descriptor,sizeof(this->_descriptor));
X+ is.read((char *)&this->_descriptor,sizeof(this->_descriptor));
X
X // pkts
X fieldLen = (this->_descriptor >> 3) + 1;
X@@ -205,7 +205,7 @@
X //-------------------------------------------------------------------------
X // int ArtsTosTableEntry::read(int fd, uint8_t version = 0)
X //-------------------------------------------------------------------------
X-int ArtsTosTableEntry::read(int fd, uint8_t version = 0)
X+int ArtsTosTableEntry::read(int fd, uint8_t version)
X {
X uint8_t fieldLen;
X int rc = 0;
X@@ -236,15 +236,15 @@
X // uint8_t version = 0) const
X //-------------------------------------------------------------------------
X ostream& ArtsTosTableEntry::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t fieldLen;
X
X // tos number
X- os.write(&this->_tosNum,sizeof(this->_tosNum));
X+ os.write((char *)&this->_tosNum,sizeof(this->_tosNum));
X
X // descriptor
X- os.write(&this->_descriptor,1);
X+ os.write((char *)&this->_descriptor,1);
X
X // pkts
X fieldLen = (this->_descriptor >> 3) + 1;
X@@ -260,7 +260,7 @@
X //-------------------------------------------------------------------------
X // int ArtsTosTableEntry::write(int fd, uint8_t version = 0) const
X //-------------------------------------------------------------------------
X-int ArtsTosTableEntry::write(int fd, uint8_t version = 0) const
X+int ArtsTosTableEntry::write(int fd, uint8_t version) const
X {
X uint8_t fieldLen;
X int rc = 0;
X@@ -482,7 +482,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsTosTableData::ComputeLength(uint8_t version = 0) const
X+uint32_t ArtsTosTableData::ComputeLength(uint8_t version) const
X {
X this->_length = 0;
X
X@@ -505,7 +505,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-uint32_t ArtsTosTableData::Length(uint8_t version = 0) const
X+uint32_t ArtsTosTableData::Length(uint8_t version) const
X {
X this->ComputeLength(version);
X return(this->_length);
X@@ -516,7 +516,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-istream& ArtsTosTableData::read(istream& is, uint8_t version = 0)
X+istream& ArtsTosTableData::read(istream& is, uint8_t version)
X {
X uint32_t numToss;
X uint32_t tosNum;
X@@ -539,7 +539,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsTosTableData::read(int fd, uint8_t version = 0)
X+int ArtsTosTableData::read(int fd, uint8_t version)
X {
X uint32_t numToss;
X uint32_t tosNum;
X@@ -581,7 +581,7 @@
X //
X //-------------------------------------------------------------------------
X ostream& ArtsTosTableData::write(ostream& os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint32_t numToss;
X
X@@ -606,7 +606,7 @@
X //.........................................................................
X //
X //-------------------------------------------------------------------------
X-int ArtsTosTableData::write(int fd, uint8_t version = 0) const
X+int ArtsTosTableData::write(int fd, uint8_t version) const
X {
X uint32_t numToss;
X int rc;
X--- ./classes/src/ArtsTosTableAggregatorMap.cc.orig Mon Oct 2 13:05:29 2000
X+++ ./classes/src/ArtsTosTableAggregatorMap.cc Sun Sep 8 04:03:23 2002
X@@ -46,9 +46,11 @@
X
X #include <string>
X #ifdef HAVE_FSTREAM
X- #include <fstream>
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X #else
X- #include <fstream.h>
X+# include <fstream.h>
X #endif
X
X #include "ArtsTosTableAggregatorMap.hh"
X--- ./classes/src/ArtsNetMatrixAggregatorMap.cc.orig Sun Sep 8 04:23:01 2002
X+++ ./classes/src/ArtsNetMatrixAggregatorMap.cc Sun Sep 8 04:24:15 2002
X@@ -46,9 +46,11 @@
X
X #include <string>
X #ifdef HAVE_FSTREAM
X- #include <fstream>
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X #else
X- #include <fstream.h>
X+# include <fstream.h>
X #endif
X
X #include "ArtsNetMatrixAggregatorMap.hh"
X--- ./classes/src/ArtsNextHopTableAggregatorMap.cc.orig Sun Sep 8 04:26:38 2002
X+++ ./classes/src/ArtsNextHopTableAggregatorMap.cc Sun Sep 8 04:27:12 2002
X@@ -46,9 +46,11 @@
X
X #include <string>
X #ifdef HAVE_FSTREAM
X- #include <fstream>
X+# include <fstream>
X+# include <iterator>
X+ using namespace std;
X #else
X- #include <fstream.h>
X+# include <fstream.h>
X #endif
X
X #include "ArtsNextHopTableAggregatorMap.hh"
X--- ./classes/src/ArtsRttTimeSeriesTableData.cc.orig Sun Sep 8 04:34:34 2002
X+++ ./classes/src/ArtsRttTimeSeriesTableData.cc Sun Sep 8 04:35:41 2002
X@@ -192,7 +192,7 @@
X ostream & ArtsRttTimeSeriesTableEntry::write(ostream & os,
X uint32_t timeBase,
X uint32_t prevSecsOffset,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t rleFlags = 0;
X uint8_t timestampSecsLength = 0;
X@@ -217,7 +217,7 @@
X
X timestampUsecsLength = BytesNeededForUint32(this->_timestamp.tv_usec);
X rleFlags |= (timestampUsecsLength - 1);
X- os.write(&rleFlags,sizeof(rleFlags));
X+ os.write((char *)&rleFlags,sizeof(rleFlags));
X if (rttLength > 0)
X g_ArtsLibInternal_Primitive.WriteUint32(os,this->_rtt,rttLength);
X if (timestampSecsLength > 0)
X@@ -232,14 +232,14 @@
X // int ArtsRttTimeSeriesTableEntry::write(int fd,
X // uint32_t timeBase,
X // uint32_t prevSecsOffset,
X-// uint8_t version = 0) const
X+// uint8_t version) const
X //............................................................................
X //
X //----------------------------------------------------------------------------
X int ArtsRttTimeSeriesTableEntry::write(int fd,
X uint32_t timeBase,
X uint32_t prevSecsOffset,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint8_t rleFlags = 0;
X uint8_t timestampSecsLength = 0;
X@@ -302,7 +302,7 @@
X //----------------------------------------------------------------------------
X uint32_t ArtsRttTimeSeriesTableEntry::Length(uint32_t timeBase,
X uint32_t prevSecsOffset,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint32_t length = sizeof(uint8_t); // always have rleFlags
X if (this->_rtt != k_droppedPacketRtt) {
X@@ -330,13 +330,13 @@
X istream & ArtsRttTimeSeriesTableEntry::read(istream & is,
X uint32_t timeBase,
X uint32_t prevSecsOffset,
X- uint8_t version = 0)
X+ uint8_t version)
X {
X uint8_t rleFlags = 0;
X uint8_t timestampUsecsLength = 0;
X uint32_t timeVal;
X
X- is.read(&rleFlags,sizeof(rleFlags));
X+ is.read((char *)&rleFlags,sizeof(rleFlags));
X
X if (rleFlags & 0x80) {
X // it's a dropped packet; RTT length is 0
X@@ -374,7 +374,7 @@
X //----------------------------------------------------------------------------
X int ArtsRttTimeSeriesTableEntry::read(int fd, uint32_t timeBase,
X uint32_t prevSecsOffset,
X- uint8_t version = 0)
X+ uint8_t version)
X {
X uint8_t rleFlags = 0;
X uint8_t timestampUsecsLength = 0;
X@@ -594,7 +594,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-istream & ArtsRttTimeSeriesTableData::read(istream& is, uint8_t version = 0)
X+istream & ArtsRttTimeSeriesTableData::read(istream& is, uint8_t version)
X {
X uint32_t numRttEntries, rttEntryNum;
X ArtsRttTimeSeriesTableEntry rttEntry;
X@@ -623,7 +623,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsRttTimeSeriesTableData::read(int fd, uint8_t version = 0)
X+int ArtsRttTimeSeriesTableData::read(int fd, uint8_t version)
X {
X uint32_t numRttEntries, rttEntryNum;
X ArtsRttTimeSeriesTableEntry rttEntry;
X@@ -664,7 +664,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-uint32_t ArtsRttTimeSeriesTableData::Length(uint8_t version = 0) const
X+uint32_t ArtsRttTimeSeriesTableData::Length(uint8_t version) const
X {
X uint32_t length = 0;
X uint32_t rttEntryNum, numRttEntries;
X@@ -693,7 +693,7 @@
X //
X //----------------------------------------------------------------------------
X ostream & ArtsRttTimeSeriesTableData::write(ostream & os,
X- uint8_t version = 0) const
X+ uint8_t version) const
X {
X uint32_t numRttEntries, rttEntryNum;
X uint32_t rttUsecs;
X@@ -729,7 +729,7 @@
X //............................................................................
X //
X //----------------------------------------------------------------------------
X-int ArtsRttTimeSeriesTableData::write(int fd, uint8_t version = 0) const
X+int ArtsRttTimeSeriesTableData::write(int fd, uint8_t version) const
X {
X uint32_t numRttEntries, rttEntryNum;
X uint32_t rttUsecs;
END-of-arts++/files/patch-aa
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209112354.g8BNstP5010699>