From d2e62235c1c29032d61c46a120beffb4b4f795ef Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 10 May 2006 07:37:51 +0000
Subject: [PATCH] Fix unsigned warning (g++ 4.0): num_xxx should always be
 unsigned.

---
 src/race.cpp       | 2 +-
 src/race.hpp       | 4 ++--
 src/unit_types.cpp | 4 ++--
 src/unit_types.hpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/race.cpp b/src/race.cpp
index ec04a488320..f32fdbde530 100644
--- a/src/race.cpp
+++ b/src/race.cpp
@@ -144,6 +144,6 @@ const config::child_list& unit_race::additional_traits() const
 	return *traits_;
 }
 
-int unit_race::num_traits() const { return ntraits_; }
+unsigned int unit_race::num_traits() const { return ntraits_; }
 
 bool unit_race::not_living() const { return not_living_; }
diff --git a/src/race.hpp b/src/race.hpp
index 501ab0fb8d3..25769b1b411 100644
--- a/src/race.hpp
+++ b/src/race.hpp
@@ -38,13 +38,13 @@ public:
 	bool uses_global_traits() const;
 
 	const config::child_list& additional_traits() const;
-	int num_traits() const;
+	unsigned int num_traits() const;
 
 	bool not_living() const;
 
 private:
 	t_string name_;
-	int ntraits_;
+	unsigned int ntraits_;
 	std::vector<std::string> names_[NUM_GENDERS];
 	markov_prefix_map next_[NUM_GENDERS];
 	int chain_size_;
diff --git a/src/unit_types.cpp b/src/unit_types.cpp
index 840d7b405cb..ddf8ee8a065 100644
--- a/src/unit_types.cpp
+++ b/src/unit_types.cpp
@@ -861,7 +861,7 @@ const unit_type& unit_type::get_variation(const std::string& name) const
 	}
 }
 
-int unit_type::num_traits() const {
+unsigned int unit_type::num_traits() const {
   return (cfg_["num_traits"].size() ? atoi(cfg_["num_traits"].c_str()) : race_->num_traits());
 }
 
@@ -1104,7 +1104,7 @@ const std::vector<config*>& unit_type::possible_traits() const
 
 bool unit_type::has_random_traits() const
 {
-	const int n = num_traits();
+	const unsigned int n = num_traits();
 	return (n > 0 && n < possibleTraits_.size());
 }
 
diff --git a/src/unit_types.hpp b/src/unit_types.hpp
index b76f66ba10a..beaef331597 100644
--- a/src/unit_types.hpp
+++ b/src/unit_types.hpp
@@ -173,7 +173,7 @@ public:
     //info on the type of unit that the unit reanimates as
     const std::string& undead_variation() const;
 
-	int num_traits() const;
+	unsigned int num_traits() const;
 
 	std::string generate_description() const;