From 2e091079d21c865dbe7583537a78fee6383ce6f1 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Mon, 3 Oct 2011 19:20:14 +1100 Subject: [PATCH] Don't abbreviate the util::range::rand function --- colour.cpp | 8 ++++---- random.cpp | 2 +- range.cpp | 2 +- range.hpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/colour.cpp b/colour.cpp index db0bf9b4..799d191b 100644 --- a/colour.cpp +++ b/colour.cpp @@ -35,10 +35,10 @@ namespace util { template<> colour random (void) { - return colour (range::UNIT.rand (), - range::UNIT.rand (), - range::UNIT.rand (), - range::UNIT.rand ()); + return colour (range::UNIT.random (), + range::UNIT.random (), + range::UNIT.random (), + range::UNIT.random ()); } template <> diff --git a/random.cpp b/random.cpp index 34b0acff..043431e0 100644 --- a/random.cpp +++ b/random.cpp @@ -28,7 +28,7 @@ namespace util { template T random (void) - { return range::UNLIMITED.rand (); } + { return range::UNLIMITED.random (); } template T& diff --git a/range.cpp b/range.cpp index 207e4331..ced93822 100644 --- a/range.cpp +++ b/range.cpp @@ -76,7 +76,7 @@ range::normalise (T val) const { template T -range::rand (void) const { +range::random (void) const { double pos = ::rand () / (double)(RAND_MAX); return (max - min) * pos; } diff --git a/range.hpp b/range.hpp index 204fdf1d..3618d9ed 100644 --- a/range.hpp +++ b/range.hpp @@ -51,7 +51,7 @@ namespace util { /// Return a pseudo-random uniformly distributed value within the range. /// There are no statistical randomness guarantees whatsoever. - T rand (void) const; + T random (void) const; bool operator ==(const range& rhs) const; bool operator !=(const range& rhs) const