diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-07-22 02:16:37 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-07-22 02:16:37 +0000 |
| commit | a773ef8a3b70936450c94bdcba1e6345a980244e (patch) | |
| tree | f3f577a111e7b489673c0a48be6c5264bef3e1f2 /src/gtest-internal-inl.h | |
| parent | 1cdc76325936ad3312be0d456b4936c8b8e6bf70 (diff) | |
| download | gtest-a773ef8a3b70936450c94bdcba1e6345a980244e.tar.gz gtest-a773ef8a3b70936450c94bdcba1e6345a980244e.tar.bz2 gtest-a773ef8a3b70936450c94bdcba1e6345a980244e.tar.xz | |
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
Diffstat (limited to 'src/gtest-internal-inl.h')
| -rw-r--r-- | src/gtest-internal-inl.h | 5 |
1 files changed, 3 insertions, 2 deletions
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<int>((raw_seed - 1U) % kMaxRandomSeed) + 1; + static_cast<int>((raw_seed - 1U) % + static_cast<unsigned int>(kMaxRandomSeed)) + 1; return normalized_seed; } |