From a773ef8a3b70936450c94bdcba1e6345a980244e Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Wed, 22 Jul 2009 02:16:37 +0000 Subject: Makes gtest compile clean with gcc -Wall -Werror (by Zhanyong Wan); refactors scons script (by Vlad Losev). git-svn-id: http://googletest.googlecode.com/svn/trunk@287 861a406c-534a-0410-8894-cb66d6ee9925 --- src/gtest-internal-inl.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gtest-internal-inl.h') diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h index 5bb981d..189852e 100644 --- a/src/gtest-internal-inl.h +++ b/src/gtest-internal-inl.h @@ -93,7 +93,7 @@ const char kShuffleFlag[] = "shuffle"; const char kThrowOnFailureFlag[] = "throw_on_failure"; // A valid random seed must be in [1, kMaxRandomSeed]. -const unsigned int kMaxRandomSeed = 99999; +const int kMaxRandomSeed = 99999; // Returns the current time in milliseconds. TimeInMillis GetTimeInMillis(); @@ -108,7 +108,8 @@ inline int GetRandomSeedFromFlag(Int32 random_seed_flag) { // Normalizes the actual seed to range [1, kMaxRandomSeed] such that // it's easy to type. const int normalized_seed = - static_cast((raw_seed - 1U) % kMaxRandomSeed) + 1; + static_cast((raw_seed - 1U) % + static_cast(kMaxRandomSeed)) + 1; return normalized_seed; } -- cgit v1.2.3