ns-2.26-gcc410.patch.rar_gcc 410 for ns 2.26_ns-2.26-gcc410.patc

diff -uNr unmodified-ns-allinone-2.26/gt-itm/src/eval.c ns-allinone-2.26/gt-itm/src/eval.c --- unmodified-ns-allinone-2.26/gt-itm/src/eval.c 2003-02-12 01:53:36.000000000 +0100 +++ ns-allinone-2.26/gt-itm/src/eval.c 2006-12-18 20:52:31.000000000 +0100 @@ -159,7 +159,7 @@ if (u == &dummy) { if (verbose) { if (artic_pt) - printf(" and %d (this ends a connected + printf(" and %d (this ends a connected \ component of the graph)\n", idx(g, artic_pt)); else printf("Isolated vertex %d\n", idx(g, v)); diff -uNr unmodified-ns-allinone-2.26/nam-1.9/agent.h ns-allinone-2.26/nam-1.9/agent.h --- unmodified-ns-allinone-2.26/nam-1.9/agent.h 2003-02-26 21:52:52.000000000 +0100 +++ ns-allinone-2.26/nam-1.9/agent.h 2006-12-18 20:52:53.000000000 +0100 @@ -70,7 +70,7 @@ inline double width() {return width_;} inline double height() {return height_;} virtual void findClosestCornertoPoint(double x, double y, - double &corner_x, double &corner_y) const = NULL; + double &corner_x, double &corner_y) const = 0; virtual void place(double x, double y); void label(const char* name, int anchor); void color(const char* name); diff -uNr unmodified-ns-allinone-2.26/nam-1.9/netgraph.h ns-allinone-2.26/nam-1.9/netgraph.h --- unmodified-ns-allinone-2.26/nam-1.9/netgraph.h 2003-02-26 21:52:54.000000000 +0100 +++ ns-allinone-2.26/nam-1.9/netgraph.h 2006-12-18 20:52:53.000000000 +0100 @@ -68,7 +68,7 @@ virtual void handle(const TraceEvent&, double now, int direction); virtual int command(int argc, const char *const *argv); virtual void BoundingBox(BBox&); - virtual void NetGraph::render(GraphView* view); + virtual void render(GraphView* view); protected: GraphView *views_; float graphdata_[MAX_GRAPH]; diff -uNr unmodified-ns-allinone-2.26/nam-1.9/node.h ns-allinone-2.26/nam-1.9/node.h --- unmodified-ns-allinone-2.26/nam-1.9/node.h 2003-02-26 21:52:54.000000000 +0100 +++ ns-allinone-2.26/nam-1.9/node.h 2006-12-18 20:52:53.000000000 +0100 @@ -223,7 +223,7 @@ Queue* queue() { return queue_; } void add_sess_queue(unsigned int grp, Queue *q); char * getTclScript(); - char * Node::getTclScriptLabel(); + char * getTclScriptLabel(); void setTclScript(const char * label, const char * script); int command(int argc, const char * const * argv); diff -uNr unmodified-ns-allinone-2.26/ns-2.26/diffusion/diff_rate.cc ns-allinone-2.26/ns-2.26/diffusion/diff_rate.cc --- unmodified-ns-allinone-2.26/ns-2.26/diffusion/diff_rate.cc 2003-02-26 23:08:02.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/diffusion/diff_rate.cc 2006-12-18 20:52:53.000000000 +0100 @@ -370,7 +370,7 @@ INTF_INSERT(routing_table[dtype].active, OutPtr); routing_table[dtype].num_active ++; } else { - GRAD_TMOUT(RetVal.cur) = max(GRAD_TMOUT(RetVal.cur), + GRAD_TMOUT(RetVal.cur) = MAX(GRAD_TMOUT(RetVal.cur), dfh->ts_ + INTEREST_TIMEOUT); } @@ -789,7 +789,7 @@ if (RetVal.cur != NULL) { cur_out = (Out_List *)(RetVal.cur); GRADIENT(cur_out) = ORIGINAL; - GRAD_TMOUT(RetVal.cur) = max(GRAD_TMOUT(RetVal.cur), + GRAD_TMOUT(RetVal.cur) = MAX(GRAD_TMOUT(RetVal.cur), dfh->ts_ + INTEREST_TIMEOUT); NUM_POS_RECV(cur_out)++; } else { diff -uNr unmodified-ns-allinone-2.26/ns-2.26/diffusion/diffusion.cc ns-allinone-2.26/ns-2.26/diffusion/diffusion.cc --- unmodified-ns-allinone-2.26/ns-2.26/diffusion/diffusion.cc 2003-02-26 23:08:03.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/diffusion/diffusion.cc 2006-12-18 20:52:53.000000000 +0100 @@ -58,6 +58,8 @@ #include "god.h" #include "routing_table.h" +void XmitFailedCallback(Packet *pkt, void *data); + char *MsgStr[]= {"", "INTEREST", "DATA", "DATA_READY", "DATA_REQUEST", "POS_REINFORCE", "NEG_REINFORCE", "INHIBIT", "TX_FAILED", "DATA_STOP" }; diff -uNr unmodified-ns-allinone-2.26/ns-2.26/diffusion/diffusion.h ns-allinone-2.26/ns-2.26/diffusion/diffusion.h --- unmodified-ns-allinone-2.26/ns-2.26/diffusion/diffusion.h 2003-02-26 23:08:03.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/diffusion/diffusion.h 2006-12-18 20:52:53.000000000 +0100 @@ -75,7 +75,7 @@ #define SEND_MESSAGE(x,y,z) send_to_dmux(prepare_message(x,y,z), 0) -#define max(a,b) (((a)<(b))?(b):(a)) +#define MAX(a,b) (((a)<(b))?(b):(a)) class DiffusionAgent; diff -uNr unmodified-ns-allinone-2.26/ns-2.26/diffusion/omni_mcast.cc ns-allinone-2.26/ns-2.26/diffusion/omni_mcast.cc --- unmodified-ns-allinone-2.26/ns-2.26/diffusion/omni_mcast.cc 2003-02-26 23:08:04.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/diffusion/omni_mcast.cc 2006-12-18 20:52:53.000000000 +0100 @@ -59,6 +59,8 @@ #include "dsr/path.h" #include "god.h" +void OmniMcastXmitFailedCallback(Packet *pkt, void *data); + static class OmniMcastClass : public TclClass { public: OmniMcastClass() : TclClass("Agent/OmniMcast") {} diff -uNr unmodified-ns-allinone-2.26/ns-2.26/diffusion/routing_table.cc ns-allinone-2.26/ns-2.26/diffusion/routing_table.cc --- unmodified-ns-allinone-2.26/ns-2.26/diffusion/routing_table.cc 2003-02-26 23:08:05.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/diffusion/routing_table.cc 2006-12-18 20:52:53.000000000 +0100 @@ -129,7 +129,7 @@ int most = 0; for (cur=iif; cur!=NULL; cur = IN_NEXT(cur)) { - most = max(most,NEW_ORG_RECV(cur)); + most = MAX(most,NEW_ORG_RECV(cur)); } return most; } diff -uNr unmodified-ns-allinone-2.26/ns-2.26/diffusion3/diffusion/diffusion.hh ns-allinone-2.26/ns-2.26/diffusion3/diffusion/diffusion.hh --- unmodified-ns-allinone-2.26/ns-2.26/diffusion3/diffusion/diffusion.hh 2003-02-26 23:08:18.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/diffusion3/diffusion/diffusion.hh 2006-12-18 20:52:53.000000000 +0100 @@ -92,6 +92,7 @@ class DiffusionCoreAgent; class HashEntry; class NeighborEntry; +class DiffRoutingAgent; typedef list<NeighborEntry *> NeighborList; typedef list<Tcl_HashEntry *> HashList; diff -uNr unmodified-ns-allinone-2.26/ns-2.26/diffusion3/lib/nr/nr.hh ns-allinone-2.26/ns-2.26/diffusion3/lib/nr/nr.hh --- unmodified-ns-allinone-2.26/ns-2.26/diffusion3/lib/nr/nr.hh 2003-02-26 23:08:21.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/diffusion3/lib/nr/nr.hh 2006-12-18 20:52:53.000000000 +0100 @@ -41,7 +41,8 @@ typedef signed int int32_t; typedef signed short int16_t; -#if defined (sparc) || defined (__CYGWIN__) +//#if defined (sparc) || defined (__CYGWIN__) +#if defined (__SVR4) && defined (__sun) typedef char int8_t; #else // Conflicts with system declaration of int8_t in Solaris and Cygwin @@ -204,6 +205,7 @@ }; // string specialization +template <> class NRSimpleAttribute<char *>: public NRAttribute { public: NRSimpleAttribute(int key, int type, int op, char *val, int size = 0); @@ -219,6 +221,7 @@ }; // blob specialization +template <> class NRSimpleAttribute<void *>: public NRAttribute { public: NRSimpleAttribute(int key, int type, int op, void *val, int size); diff -uNr unmodified-ns-allinone-2.26/ns-2.26/dsr/dsragent.cc ns-allinone-2.26/ns-2.26/dsr/dsragent.cc --- unmodified-ns-allinone-2.26/ns-2.26/dsr/dsragent.cc 2003-02-26 23:08:36.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/dsr/dsragent.cc 2006-12-18 20:52:53.000000000 +0100 @@ -188,6 +188,9 @@ */ +void XmitFlowFailureCallback(Packet *pkt, void *data); +void XmitFailureCallback(Packet *pkt, void *data); + /*=========================================================================== SendBuf management and helpers ---------------------------------------------------------------------------*/ diff -uNr unmodified-ns-allinone-2.26/ns-2.26/indep-utils/cmu-scen-gen/setdest/Makefile.in ns-allinone-2.26/ns-2.26/indep-utils/cmu-scen-gen/setdest/Makefile.in --- unmodified-ns-allinone-2.26/ns-2.26/indep-utils/cmu-scen-gen/setdest/Makefile.in 2003-02-26 23:08:45.000000000 +0100 +++ ns-allinone-2.26/ns-2.26/indep-utils/cmu-scen-gen/setdest/Makefile.in 2006-12-18 20:52:53.000000000 +0100 @@ -37,7 +37,7