anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/random: Rename random() -> random_range() 

This prevents a conflict with C's stdlib.h.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-09-09 08:55:57 -04:00
parent 023bae737c
commit cea50ae37f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/queue.cpp
View File

@ -192,7 +192,7 @@ Track *Queue :: next()
else if (_tracks.size() == 1)
_cur = 0;
else if (_flags & Q_RANDOM)
_cur += random(1, _tracks.size() / 2);
_cur += random_range(1, _tracks.size() / 2);
else
_cur++;

2
include/core/random.h
View File

@ -35,7 +35,7 @@ static inline void random_seed(unsigned int n)
* @param max Maximum value that will be returned.
* @return A random value where min <= value <= max.
*/
static inline unsigned int random(unsigned int min, unsigned int max)
static inline unsigned int random_range(unsigned int min, unsigned int max)
{
if (min >= max)
return min;

4
tests/core/random.cpp
View File

@ -12,9 +12,9 @@ static void test_rng(unsigned int seed)
for (unsigned int i = 0; i <= 10; i++) {
if (i <= seed)
test_equal(random(seed, i), seed);
test_equal(random_range(seed, i), seed);
else
test_equal(random(seed, i), seed + (i % (i - seed)));
test_equal(random_range(seed, i), seed + (i % (i - seed)));
}
}