From 90b15f734f889a585d2490f963e7b9f53f9157d1 Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Sat, 29 Jan 2011 22:16:51 +0000
Subject: Fix build with gcc4.5

---
 net/ns/distinfo         |  4 +++-
 net/ns/patches/patch-ar | 15 +++++++++++++++
 net/ns/patches/patch-as | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 net/ns/patches/patch-ar
 create mode 100644 net/ns/patches/patch-as

(limited to 'net')

diff --git a/net/ns/distinfo b/net/ns/distinfo
index bc0d5e16f15..04a00e4771f 100644
--- a/net/ns/distinfo
+++ b/net/ns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2011/01/25 22:22:14 shattered Exp $
+$NetBSD: distinfo,v 1.15 2011/01/29 22:16:51 markd Exp $
 
 SHA1 (ns-2.33.tar.gz) = 0efd6aed45b504fcf3f125b0be00a60b87516a03
 RMD160 (ns-2.33.tar.gz) = 54326b8ff4e63c0a9712c517c7ad4d9327a41d39
@@ -18,3 +18,5 @@ SHA1 (patch-an) = c6dd6b93332a6c6dd169975836df9ef802bfc206
 SHA1 (patch-ao) = 2a1fd71686ff206fe2212605f91b8167b998d6e2
 SHA1 (patch-ap) = f130c112d7dfe114e637e190750d9caad55e4703
 SHA1 (patch-aq) = c46339a81f3f0dea9754f733d567c3c93f7dc19e
+SHA1 (patch-ar) = 64dafe254cfd28723422047aecb8086028d9f69e
+SHA1 (patch-as) = 5fdd4418db3ee4b189913f1110fb260af710f746
diff --git a/net/ns/patches/patch-ar b/net/ns/patches/patch-ar
new file mode 100644
index 00000000000..345e9b77890
--- /dev/null
+++ b/net/ns/patches/patch-ar
@@ -0,0 +1,15 @@
+$NetBSD: patch-ar,v 1.4 2011/01/29 22:16:51 markd Exp $
+
+Fix build with gcc4.5
+
+--- tools/ranvar.cc.orig	2008-04-01 02:00:25.000000000 +0000
++++ tools/ranvar.cc
+@@ -216,7 +216,7 @@ double GammaRandomVariable::value()
+ 	// ACM Transactions on mathematical software, Vol. 26, No. 3, Sept. 2000
+ 	if (alpha_ < 1) {
+ 		double u = rng_->uniform(1.0);
+-		return GammaRandomVariable::GammaRandomVariable(1.0 + alpha_, beta_).value() * pow (u, 1.0 / alpha_);
++		return GammaRandomVariable(1.0 + alpha_, beta_).value() * pow (u, 1.0 / alpha_);
+ 	}
+ 	
+ 	double x, v, u;
diff --git a/net/ns/patches/patch-as b/net/ns/patches/patch-as
new file mode 100644
index 00000000000..454dadc3d43
--- /dev/null
+++ b/net/ns/patches/patch-as
@@ -0,0 +1,18 @@
+$NetBSD: patch-as,v 1.1 2011/01/29 22:16:51 markd Exp $
+
+Fix build with gcc4.5
+
+--- mobile/nakagami.cc.orig	2008-04-01 02:00:24.000000000 +0000
++++ mobile/nakagami.cc
+@@ -180,9 +180,9 @@ double Nakagami::Pr(PacketStamp *t, Pack
+  		double resultPower;
+  		
+         if (int_m == m) {
+- 			resultPower = ErlangRandomVariable::ErlangRandomVariable(Pr/m, int_m).value();
++ 			resultPower = ErlangRandomVariable(Pr/m, int_m).value();
+  		} else {
+- 			resultPower = GammaRandomVariable::GammaRandomVariable(m, Pr/m).value();
++ 			resultPower = GammaRandomVariable(m, Pr/m).value();
+  		}
+  		return resultPower;
+ 	}
-- 
cgit v1.2.3