Renamed a method tolower to bz_tolower to avoid namespace collisions.

Approved by wiz.

3 files changed, 69 insertions, 1 deletions

diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo
index e6acc08128a..227117ce05e 100644
--- a/games/bzflag/distinfo
+++ b/games/bzflag/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 23:11:55 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/03/16 12:41:51 rillig Exp $
 
 SHA1 (bzflag-1.10.6.20040515.tar.gz) = 608b99791daf1236239102a50d3e6967f0d4f790
 RMD160 (bzflag-1.10.6.20040515.tar.gz) = cacbd25a093a1f52e1a6654d94cff831ef79554a
@@ -8,3 +8,5 @@ SHA1 (patch-ab) = 4c5cf621c5f66768b61669087373e74233d179ab
 SHA1 (patch-ad) = c7d9cc323c60477beab3e2826db1f89b1f9fa1b4
 SHA1 (patch-ae) = 8935c9b8b24fee942460b3186ac0797bdbaf921a
 SHA1 (patch-af) = 8957feb16144cbb38436cd1f77358d50fb93f66b
+SHA1 (patch-ag) = 432decad5019e6d7901670702970cd1c063e0613
+SHA1 (patch-ah) = d0fcedef298246ca7e020f43494755124c5e4f37
diff --git a/games/bzflag/patches/patch-ag b/games/bzflag/patches/patch-ag
new file mode 100644
index 00000000000..673573e06b8
--- /dev/null
+++ b/games/bzflag/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.3 2005/03/16 12:41:51 rillig Exp $
+
+tolower is a macro on NetBSD-1.6.2.
+
+--- include/TextUtils.h.orig	Wed May 12 22:10:51 2004
++++ include/TextUtils.h	Tue Mar 15 23:59:22 2005
+@@ -43,7 +43,7 @@ public:
+ 
+   /** returns a string converted to lowercase
+    */
+-  inline static std::string tolower(const std::string& s)
++  inline static std::string bz_tolower(const std::string& s)
+   {
+     std::string trans = s;
+ 
+@@ -55,7 +55,7 @@ public:
+ 
+   /** returns a string converted to uppercase
+    */
+-  inline static std::string toupper(const std::string& s)
++  inline static std::string bz_toupper(const std::string& s)
+   {
+     std::string trans = s;
+     std::transform (trans.begin(), trans.end(), // source
diff --git a/games/bzflag/patches/patch-ah b/games/bzflag/patches/patch-ah
new file mode 100644
index 00000000000..fed3500e74d
--- /dev/null
+++ b/games/bzflag/patches/patch-ah
@@ -0,0 +1,42 @@
+$NetBSD: patch-ah,v 1.3 2005/03/16 12:41:51 rillig Exp $
+
+tolower is a macro on NetBSD-1.6.2.
+
+--- src/bzfs/VotingArbiter.cxx.orig	Tue Mar 23 07:36:31 2004
++++ src/bzfs/VotingArbiter.cxx	Wed Mar 16 00:08:15 2005
+@@ -173,7 +173,7 @@ bool VotingArbiter::hasSuffrage(std::str
+   }
+ 
+   // has this player already voted?
+-  if (_votingBooth->hasVoted(string_util::tolower(player))) {
++  if (_votingBooth->hasVoted(string_util::bz_tolower(player))) {
+     return false;
+   }
+ 
+@@ -196,7 +196,7 @@ bool VotingArbiter::voteYes(std::string 
+     return false;
+   }
+ 
+-  return (_votingBooth->vote(string_util::tolower(player), "yes"));
++  return (_votingBooth->vote(string_util::bz_tolower(player), "yes"));
+ }
+ 
+ bool VotingArbiter::voteNo(std::string player)
+@@ -210,7 +210,7 @@ bool VotingArbiter::voteNo(std::string p
+     return false;
+   }
+ 
+-  return (_votingBooth->vote(string_util::tolower(player), "no"));
++  return (_votingBooth->vote(string_util::bz_tolower(player), "no"));
+ }
+ 
+ unsigned long int VotingArbiter::getYesCount(void) const
+@@ -314,7 +314,7 @@ bool VotingArbiter::retractVote(std::str
+   if (_votingBooth == NULL) {
+     return false;
+   }
+-  return _votingBooth->retractVote(string_util::tolower(player));
++  return _votingBooth->retractVote(string_util::bz_tolower(player));
+ }
+ 
+