diff options
author | Steve Price <steve@FreeBSD.org> | 1999-11-28 18:15:18 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-11-28 18:15:18 +0000 |
commit | f338314e2ee4b4202ed368c9448732f5061978ef (patch) | |
tree | 0ff622e77d3e2c75af2b265aa4fd82f9a5b88a03 /net/irrtoolset | |
parent | Update to Tcl/Tk version 8.2. (diff) |
Cope with ANSI C++'isms when gcc 2.95 is the system compiler.
Notes
Notes:
svn path=/head/; revision=23471
Diffstat (limited to 'net/irrtoolset')
-rw-r--r-- | net/irrtoolset/files/patch-aa | 31 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-ab | 20 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-ac | 208 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-ad | 11 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-ae | 11 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-af | 10 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-ag | 11 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-ah | 20 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-ai | 11 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-aj | 14 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-ak | 11 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-al | 11 | ||||
-rw-r--r-- | net/irrtoolset/files/patch-am | 11 |
13 files changed, 378 insertions, 2 deletions
diff --git a/net/irrtoolset/files/patch-aa b/net/irrtoolset/files/patch-aa index 0b92b7897829..b4052b639c36 100644 --- a/net/irrtoolset/files/patch-aa +++ b/net/irrtoolset/files/patch-aa @@ -1,5 +1,5 @@ ---- src/misc/net.hh.orig Sun Sep 19 16:59:27 1999 -+++ src/misc/net.hh Sun Sep 19 17:00:00 1999 +--- src/misc/net.hh.orig Wed Jan 28 17:40:42 1998 ++++ src/misc/net.hh Sat Nov 27 18:11:23 1999 @@ -86,12 +86,12 @@ int bind (...); int listen (...); @@ -16,3 +16,30 @@ int gettimeofday (...); } +@@ -132,7 +132,7 @@ + class Timer { + struct timeval tv; + struct timezone tz; +- init_time () { ++ void init_time () { + bzero ((char *) &tv, sizeof (struct timeval)); + ::gettimeofday (&tv, &tz); + } +@@ -256,7 +256,7 @@ + return ptr; + } + u_long getInaddr () { return hexaddr; } +- print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); } ++ void print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); } + + Error error; + }; +@@ -331,7 +331,7 @@ + error.warn("listen"); + return error(); + } +- accept () { ++ int accept () { + //u_long addrlen; + int addrlen = sizeof (struct sockaddr); + bzero ((char *) &socknew, sizeof (socknew)); diff --git a/net/irrtoolset/files/patch-ab b/net/irrtoolset/files/patch-ab new file mode 100644 index 000000000000..6566ed2b1af4 --- /dev/null +++ b/net/irrtoolset/files/patch-ab @@ -0,0 +1,20 @@ +--- src/dbase/Route.hh.orig Sat Nov 27 18:08:21 1999 ++++ src/dbase/Route.hh Sat Nov 27 18:08:41 1999 +@@ -92,7 +92,7 @@ + clear(); + } + +- clear () { ++ void clear () { + pix = NULL; + _dontcare = 0; + } +@@ -248,7 +248,7 @@ + pref = 0; + } + +- set (Pix asn, int p) { ++ void set (Pix asn, int p) { + asno = asn; + pref = p; + } diff --git a/net/irrtoolset/files/patch-ac b/net/irrtoolset/files/patch-ac new file mode 100644 index 000000000000..ca2b0e1d8f1f --- /dev/null +++ b/net/irrtoolset/files/patch-ac @@ -0,0 +1,208 @@ +--- src/dbase/Node.h.orig Sat Nov 27 18:11:57 1999 ++++ src/dbase/Node.h Sat Nov 27 18:16:21 1999 +@@ -101,7 +101,7 @@ + protected: + virtual void print(ostream &os) = 0; + public: +- virtual operator== (Node &b) = 0; ++ virtual int operator== (Node &b) = 0; + virtual void InOrderPrint() = 0; + virtual void PostOrderPrint() { InOrderPrint(); } + virtual ~Node() {}; +@@ -144,7 +144,7 @@ + virtual void print(ostream &os) = 0; + + public: +- virtual Execute(Route &r) = 0; ++ virtual void Execute(Route &r) = 0; + virtual ActionNode *FindFirst(Node_t _type) = 0; + int operator< (ActionNode &b); + friend ostream &operator<<(ostream &os, ActionNode *an) { +@@ -172,7 +172,7 @@ + type = T_ANDNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_ANDNode + && left == ((ANDNode&) b).left + && right == ((ANDNode&) b).right; +@@ -200,7 +200,7 @@ + type = T_ORNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_ORNode + && left == ((ORNode&) b).left + && right == ((ORNode&) b).right; +@@ -227,7 +227,7 @@ + type = T_NotNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_NotNode + && left == ((NotNode&) b).left; + } +@@ -256,7 +256,7 @@ + type = T_AssignNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_AssignNode + && val == ((AssignNode&) b).val + && left == ((AssignNode&) b).left; +@@ -281,7 +281,7 @@ + type = T_ANYNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_ANYNode; + } + +@@ -305,7 +305,7 @@ + type = T_ASNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_ASNode + && val == ((ASNode&) b).val; + } +@@ -330,7 +330,7 @@ + type = T_ASMacroNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_ASMacroNode + && val == ((ASMacroNode&) b).val; + } +@@ -355,7 +355,7 @@ + type = T_CommNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_CommNode + && val == ((CommNode&) b).val; + } +@@ -382,7 +382,7 @@ + cidr_root = NULL; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_NetListNode + && nets == ((NetListNode&) b).nets; + } +@@ -391,7 +391,7 @@ + virtual NormalExpression *Evaluate(int expand); + virtual int match(Route &r, char dontcare); + virtual int match_exact_or_more_specific(Route &r, char dontcare); +- add(Pix pi) { nets.add(pi); } ++ void add(Pix pi) { nets.add(pi); } + }; + + ////////////////////////////// ASPathNode ////////////////////////////// +@@ -412,7 +412,7 @@ + type = T_ASPathNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + ASSERT(0); + return 0; + } +@@ -438,7 +438,7 @@ + type = T_RegisterNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_RegisterNode + && val == ((RegisterNode&) b).val; + } +@@ -460,13 +460,13 @@ + type = T_PrefNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_PrefNode + && val == ((PrefNode&) b).val; + } + + virtual void InOrderPrint(); +- virtual Execute(Route &r) { ++ virtual void Execute(Route &r) { + } + virtual ActionNode *FindFirst(Node_t _type) { + if (type == _type) +@@ -492,13 +492,13 @@ + type = T_MEDNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_MEDNode + && val == ((MEDNode&) b).val; + } + + virtual void InOrderPrint(); +- virtual Execute(Route &r) { ++ virtual void Execute(Route &r) { + } + virtual ActionNode *FindFirst(Node_t _type) { + if (type == _type) +@@ -524,13 +524,13 @@ + type = T_DPANode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_DPANode + && val == ((DPANode&) b).val; + } + + virtual void InOrderPrint(); +- virtual Execute(Route &r) { ++ virtual void Execute(Route &r) { + } + virtual ActionNode *FindFirst(Node_t _type) { + if (type == _type) +@@ -552,12 +552,12 @@ + type = T_NoopNode; + } + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_NoopNode; + } + + virtual void InOrderPrint(); +- virtual Execute(Route &r) {} ++ virtual void Execute(Route &r) {} + virtual ActionNode *FindFirst(Node_t _type) { + if (type == _type) + return this; +@@ -581,14 +581,14 @@ + } + virtual ~ComposeNode(); + +- virtual operator== (Node& b) { ++ virtual int operator== (Node& b) { + return b.type == T_ComposeNode + && left == ((ComposeNode&) b).left + && right == ((ComposeNode&) b).right; + } + + virtual void InOrderPrint(); +- virtual Execute(Route &r) {} ++ virtual void Execute(Route &r) {} + virtual ActionNode *FindFirst(Node_t _type) { + ActionNode *r; + if (type == _type) diff --git a/net/irrtoolset/files/patch-ad b/net/irrtoolset/files/patch-ad new file mode 100644 index 000000000000..d0560a973b2a --- /dev/null +++ b/net/irrtoolset/files/patch-ad @@ -0,0 +1,11 @@ +--- src/misc/Error.hh.orig Sat Nov 27 18:17:24 1999 ++++ src/misc/Error.hh Sat Nov 27 18:17:31 1999 +@@ -378,7 +378,7 @@ + reset(); + } + +- reset() { ++ void reset() { + errno = 0; + level_ = ErrorNone; + messages_.clear(); diff --git a/net/irrtoolset/files/patch-ae b/net/irrtoolset/files/patch-ae new file mode 100644 index 000000000000..8c3005236be0 --- /dev/null +++ b/net/irrtoolset/files/patch-ae @@ -0,0 +1,11 @@ +--- src/peval/xx_lexer.y.orig Sat Nov 27 18:18:56 1999 ++++ src/peval/xx_lexer.y Sat Nov 27 18:19:07 1999 +@@ -94,7 +94,7 @@ + NULL, ERROR_TKN + }; + +-static inline strtoupper(char *c) { ++static inline void strtoupper(char *c) { + for (; *c; c++) + if (isascii(*c) && isalpha(*c)) + *c = toupper(*c); diff --git a/net/irrtoolset/files/patch-af b/net/irrtoolset/files/patch-af new file mode 100644 index 000000000000..50022888976a --- /dev/null +++ b/net/irrtoolset/files/patch-af @@ -0,0 +1,10 @@ +--- src/misc/net.cc.orig Sat Nov 27 18:20:31 1999 ++++ src/misc/net.cc Sat Nov 27 18:21:15 1999 +@@ -215,6 +215,7 @@ + init_server (p); + } + ++int + TCP::init_server (int p) { + setLocalPort (p); + bind(); diff --git a/net/irrtoolset/files/patch-ag b/net/irrtoolset/files/patch-ag new file mode 100644 index 000000000000..f5519df2a198 --- /dev/null +++ b/net/irrtoolset/files/patch-ag @@ -0,0 +1,11 @@ +--- src/dbase/irr_lexer.y.orig Sat Nov 27 18:22:22 1999 ++++ src/dbase/irr_lexer.y Sat Nov 27 18:22:44 1999 +@@ -73,7 +73,7 @@ + + #include <cctype> + +-static inline strtoupper(char *c) { ++static inline void strtoupper(char *c) { + for (; *c; c++) + if (isascii(*c) && isalpha(*c)) + *c = toupper(*c); diff --git a/net/irrtoolset/files/patch-ah b/net/irrtoolset/files/patch-ah new file mode 100644 index 000000000000..4278782c08ab --- /dev/null +++ b/net/irrtoolset/files/patch-ah @@ -0,0 +1,20 @@ +--- src/dbase/irr_parser.y.orig Sat Nov 27 18:23:53 1999 ++++ src/dbase/irr_parser.y Sat Nov 27 18:25:00 1999 +@@ -90,7 +90,7 @@ + char *error_while_expecting = NULL; + + static regexp_symbol *re_symbol; +-static insert_or_update_filter_action(ListHead<Filter_Action> &l, ++static void insert_or_update_filter_action(ListHead<Filter_Action> &l, + ActionNode *action, FilterNode *filter); + static ASPolicy *find_or_insert_peer_as(Pix peer); + static InterASPolicy *find_or_insert_peering(ASPolicy *p, Pix laddr, Pix raddr); +@@ -635,7 +635,7 @@ + return(0); + } + +-static insert_or_update_filter_action(ListHead<Filter_Action> &l, ++static void insert_or_update_filter_action(ListHead<Filter_Action> &l, + ActionNode *action, FilterNode *filter) { + Filter_Action *fap, *fap2; + diff --git a/net/irrtoolset/files/patch-ai b/net/irrtoolset/files/patch-ai new file mode 100644 index 000000000000..18de9569197e --- /dev/null +++ b/net/irrtoolset/files/patch-ai @@ -0,0 +1,11 @@ +--- src/roe/roe_config.hh.orig Sat Nov 27 18:35:37 1999 ++++ src/roe/roe_config.hh Sat Nov 27 18:36:14 1999 +@@ -42,7 +42,7 @@ + + class Configure { + public: +- const int size = 12; ++ static const int size = 12; + + class DBUpdate { + public: diff --git a/net/irrtoolset/files/patch-aj b/net/irrtoolset/files/patch-aj new file mode 100644 index 000000000000..6d190fb677b6 --- /dev/null +++ b/net/irrtoolset/files/patch-aj @@ -0,0 +1,14 @@ +--- src/aoe/TclApp.cc.orig Sat Nov 27 18:38:25 1999 ++++ src/aoe/TclApp.cc Sat Nov 27 18:43:51 1999 +@@ -186,9 +186,9 @@ + // Call Tcl function to create a Tcl command + if (Tcl_CreateCommand(ptInterp, + pcCommand->getName(), +- TclCommand::command, ++ &TclCommand::command, + (ClientData)pcCommand, +- TclCommand::cleanUp) == NULL) return 0; ++ &TclCommand::cleanUp) == NULL) return 0; + return 1; + } + diff --git a/net/irrtoolset/files/patch-ak b/net/irrtoolset/files/patch-ak new file mode 100644 index 000000000000..05060ae5f711 --- /dev/null +++ b/net/irrtoolset/files/patch-ak @@ -0,0 +1,11 @@ +--- src/aoe/TclLabel.cc.orig Sat Nov 27 18:45:09 1999 ++++ src/aoe/TclLabel.cc Sat Nov 27 18:45:24 1999 +@@ -47,7 +47,7 @@ + #include "TclLabel.hh" + #include "TclApp.hh" + +-TclLabel::clear(void) ++int TclLabel::clear(void) + { + TclApplication *pcApp = (TclApplication *)getExtraArgument(); + return (pcApp->evalf("%s configure -text {}", getName())); diff --git a/net/irrtoolset/files/patch-al b/net/irrtoolset/files/patch-al new file mode 100644 index 000000000000..49b068f99199 --- /dev/null +++ b/net/irrtoolset/files/patch-al @@ -0,0 +1,11 @@ +--- src/prtraceroute/netraw.hh.orig Sat Nov 27 18:46:27 1999 ++++ src/prtraceroute/netraw.hh Sat Nov 27 18:46:49 1999 +@@ -121,7 +121,7 @@ + rawIP (int protocol = IPPROTO_RAW); + rawIP (char *hostname, int protocol = IPPROTO_RAW); + +- setIpaddresses (); // can be used for incoming packets. ++ void setIpaddresses (); // can be used for incoming packets. + + int write (){return rawPacket::write ((char *) ip_hdr, ip_hdr->ip_len);} + int send (){return rawPacket::send ((char *) ip_hdr, ip_hdr->ip_len);} diff --git a/net/irrtoolset/files/patch-am b/net/irrtoolset/files/patch-am new file mode 100644 index 000000000000..70e7cb9572ed --- /dev/null +++ b/net/irrtoolset/files/patch-am @@ -0,0 +1,11 @@ +--- src/prtraceroute/prtraceroute.hh.orig Sat Nov 27 18:47:35 1999 ++++ src/prtraceroute/prtraceroute.hh Sat Nov 27 18:47:45 1999 +@@ -121,7 +121,7 @@ + u_int flags; + void _add (ipAddr *ipaddr); + +- _hop () { ++ void _hop () { + ipaddr = (ipAddr *) NULL; + autnum = NULL; + route = new Route(); |