-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make this package compile with gcc-4 by initializing const static data
members outside their class.
- Loading branch information
minskim
committed
Sep 8, 2005
1 parent
abdbcc2
commit 55bbb94
Showing
3 changed files
with
57 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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") {} |