diff options
| author | minskim <minskim@pkgsrc.org> | 2005-09-08 17:19:13 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2005-09-08 17:19:13 +0000 |
| commit | ad601444a6e091435e7ca7f6cc170493a97e83af (patch) | |
| tree | 7a04080b1f8031d654b41ffc7c2ae8d5a9eefc80 /net/ns/patches | |
| parent | 818679396490ec6511c500da54e1303f293c4582 (diff) | |
| download | pkgsrc-ad601444a6e091435e7ca7f6cc170493a97e83af.tar.gz | |
Make this package compile with gcc-4 by initializing const static data
members outside their class.
Diffstat (limited to 'net/ns/patches')
| -rw-r--r-- | net/ns/patches/patch-ag | 36 | ||||
| -rw-r--r-- | net/ns/patches/patch-ar | 18 |
2 files changed, 54 insertions, 0 deletions
diff --git a/net/ns/patches/patch-ag b/net/ns/patches/patch-ag new file mode 100644 index 00000000000..8e091df0b48 --- /dev/null +++ b/net/ns/patches/patch-ag @@ -0,0 +1,36 @@ +$NetBSD: patch-ag,v 1.3 2005/09/08 17:19:14 minskim Exp $ + +--- xcp/xcpq.h.orig 2005-02-03 10:29:20.000000000 -0800 ++++ xcp/xcpq.h +@@ -113,11 +113,11 @@ protected: + XCPTimer* rtt_timer_; + double link_capacity_bps_; + +- static const double ALPHA_ = 0.4; +- static const double BETA_ = 0.226; +- static const double GAMMA_ = 0.1; +- static const double XCP_MAX_INTERVAL= 1.0; +- static const double XCP_MIN_INTERVAL= .001; ++ static const double ALPHA_; ++ static const double BETA_; ++ static const double GAMMA_; ++ static const double XCP_MAX_INTERVAL; ++ static const double XCP_MIN_INTERVAL; + + double Te_; // control interval + double Tq_; +@@ -141,7 +141,7 @@ protected: + double b_[BSIZE]; + double t_[BSIZE]; + int maxb_; +- static const double BWIDTH = 0.01; ++ static const double BWIDTH; + int min_queue_ci_; + int max_queue_ci_; + +@@ -158,5 +158,4 @@ protected: + + }; + +- + #endif //NS_XCPQ_H diff --git a/net/ns/patches/patch-ar b/net/ns/patches/patch-ar new file mode 100644 index 00000000000..2b5b3838bd9 --- /dev/null +++ b/net/ns/patches/patch-ar @@ -0,0 +1,18 @@ +$NetBSD: patch-ar,v 1.1 2005/09/08 17:19:14 minskim Exp $ + +--- xcp/xcpq.cc.orig 2005-02-03 10:29:20.000000000 -0800 ++++ xcp/xcpq.cc +@@ -24,6 +24,13 @@ + #include "xcp.h" + #include "random.h" + ++const double XCPQueue::ALPHA_ = 0.4; ++const double XCPQueue::BETA_ = 0.226; ++const double XCPQueue::GAMMA_ = 0.1; ++const double XCPQueue::XCP_MAX_INTERVAL = 1.0; ++const double XCPQueue::XCP_MIN_INTERVAL = .001; ++const double XCPQueue::BWIDTH = 0.01; ++ + static class XCPQClass : public TclClass { + public: + XCPQClass() : TclClass("Queue/DropTail/XCPQ") {} |