summaryrefslogtreecommitdiff
path: root/core/math/math_funcs.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-05-07 20:02:54 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-05-07 20:02:54 -0300
commitc99813dc38cc79b37529cdd98dc2bc2c3ff69edc (patch)
tree99ea11d3829bf296ea23941a83ebc61158028087 /core/math/math_funcs.cpp
parent7156aff16041ea56ff1f3aea2a622c130bcca7a9 (diff)
parentac9263c680076eed36887a681cb59fdcce6c6f73 (diff)
Merge pull request #1826 from eehrich/master
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
Diffstat (limited to 'core/math/math_funcs.cpp')
-rw-r--r--core/math/math_funcs.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp
index 6ad5c7499b..3c94ac5bc7 100644
--- a/core/math/math_funcs.cpp
+++ b/core/math/math_funcs.cpp
@@ -36,8 +36,9 @@ uint32_t Math::default_seed=1;
#define PHI 0x9e3779b9
-static uint32_t Q[4096], c = 362436;
-
+#if 0
+static uint32_t Q[4096];
+#endif
uint32_t Math::rand_from_seed(uint32_t *seed) {
@@ -269,7 +270,7 @@ bool Math::is_inf(double p_val) {
uint32_t Math::larger_prime(uint32_t p_val) {
- static const int primes[] = {
+ static const uint32_t primes[] = {
5,
13,
23,