summaryrefslogtreecommitdiff
path: root/gnuradio-runtime/lib/math
diff options
context:
space:
mode:
authorgnieboer <gnieboer@corpcomm.net>2016-02-07 00:03:00 +0300
committerJohnathan Corgan <johnathan@corganlabs.com>2016-05-30 13:21:13 -0700
commitae26f969c9c260556aad4ffd006fea96f3452d01 (patch)
treedf147aeb0b90dc60b1680d13942ea096c3bc1f63 /gnuradio-runtime/lib/math
parent97059450f485bb1bf74f5dc2b2bf8b1852a0a7bf (diff)
MSVC-specific changes for compatibility
* Changed gr-dtv cmake so SSE2 would be detected on both MSVC and GCC compilers * Removed addition of /O2 flag on MSVC builds as it conflicts with /RTC1 flag * Added detection of MSVC 14.0 and added additional filenames to library detection to cover what windows builds the dependencies as. * Additional name options were placed at end so as to not conflict with other builds. * Removed use of not() function and replaced with standard C syntax. The check for zero is to handle the edge case where the random numbers return zero and would cause a div/zero error two lines afterwards. * Add dwrite library for win32 builds for qtgui
Diffstat (limited to 'gnuradio-runtime/lib/math')
-rw-r--r--gnuradio-runtime/lib/math/random.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/math/random.cc b/gnuradio-runtime/lib/math/random.cc
index 5e16c96ea4..35f63076b2 100644
--- a/gnuradio-runtime/lib/math/random.cc
+++ b/gnuradio-runtime/lib/math/random.cc
@@ -127,7 +127,7 @@ namespace gr {
x = 2.0*ran1()-1.0;
y = 2.0*ran1()-1.0;
s = x*x+y*y;
- }while(not(s<1.0));
+ }while(s >= 1.0f || s == 0.0f);
d_gauss_stored = true;
d_gauss_value = x*sqrt(-2.0*log(s)/s);
return y*sqrt(-2.0*log(s)/s);