diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 23:28:29 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 23:28:29 +0000 |
| commit | ba990126c119b5df777b9afcdc3d216cb9f21e5b (patch) | |
| tree | 50025bd522a070efa235fff202040a95786323aa /base | |
| parent | c7166029d29e0f702a0ec4c3efc9aa4319de35cb (diff) | |
| download | chromium_src-ba990126c119b5df777b9afcdc3d216cb9f21e5b.zip chromium_src-ba990126c119b5df777b9afcdc3d216cb9f21e5b.tar.gz chromium_src-ba990126c119b5df777b9afcdc3d216cb9f21e5b.tar.bz2 | |
RandUInt -> RandUint to match the style of other Uint functions.
Review URL: http://codereview.chromium.org/10767
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/rand_util.cc | 4 | ||||
| -rw-r--r-- | base/rand_util.h | 2 | ||||
| -rw-r--r-- | base/rand_util_posix.cc | 2 | ||||
| -rw-r--r-- | base/rand_util_win.cc | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/base/rand_util.cc b/base/rand_util.cc index cefc7bb..8480c82 100644 --- a/base/rand_util.cc +++ b/base/rand_util.cc @@ -17,7 +17,7 @@ int RandInt(int min, int max) { DCHECK(min <= max); uint64 range = static_cast<int64>(max) - min + 1; - uint64 number = base::RandUInt64(); + uint64 number = base::RandUint64(); int result = min + static_cast<int>(number % range); DCHECK(result >= min && result <= max); return result; @@ -31,7 +31,7 @@ double RandDouble() { COMPILE_ASSERT(std::numeric_limits<double>::radix == 2, otherwise_use_scalbn); static const int kBits = std::numeric_limits<double>::digits; - uint64 random_bits = base::RandUInt64() & ((GG_UINT64_C(1) << kBits) - 1); + uint64 random_bits = base::RandUint64() & ((GG_UINT64_C(1) << kBits) - 1); double result = ldexp(static_cast<double>(random_bits), -1 * kBits); DCHECK(result >= 0.0 && result < 1.0); return result; diff --git a/base/rand_util.h b/base/rand_util.h index cd687dd..18e7469 100644 --- a/base/rand_util.h +++ b/base/rand_util.h @@ -10,7 +10,7 @@ namespace base { // Returns a random number in range [0, kuint64max]. Thread-safe. -uint64 RandUInt64(); +uint64 RandUint64(); // Returns a random number between min and max (inclusive). Thread-safe. int RandInt(int min, int max); diff --git a/base/rand_util_posix.cc b/base/rand_util_posix.cc index 392cde5..e0b4257 100644 --- a/base/rand_util_posix.cc +++ b/base/rand_util_posix.cc @@ -12,7 +12,7 @@ namespace base { -uint64 RandUInt64() { +uint64 RandUint64() { uint64 number; int urandom_fd = open("/dev/urandom", O_RDONLY); diff --git a/base/rand_util_win.cc b/base/rand_util_win.cc index 12cf11e..03176ab 100644 --- a/base/rand_util_win.cc +++ b/base/rand_util_win.cc @@ -11,7 +11,7 @@ namespace { -uint32 RandUInt32() { +uint32 RandUint32() { uint32 number; CHECK(rand_s(&number) == 0); return number; @@ -21,9 +21,9 @@ uint32 RandUInt32() { namespace base { -uint64 RandUInt64() { - uint32 first_half = RandUInt32(); - uint32 second_half = RandUInt32(); +uint64 RandUint64() { + uint32 first_half = RandUint32(); + uint32 second_half = RandUint32(); return (static_cast<uint64>(first_half) << 32) + second_half; } |