diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-15 15:34:58 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-15 15:34:58 -0700 |
| commit | cdeaea745c2f653a2fa7d5429789c4492596e283 (patch) | |
| tree | 0c0132edb74129ab0affdc03243403c682db896a /gnuradio-runtime/lib/math | |
| parent | cb4ab189ce58333f6e5262a9972788864f003807 (diff) | |
| parent | b7f5d3959e059cba3deff0bc6881de4fedf829df (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime/lib/math')
| -rw-r--r-- | gnuradio-runtime/lib/math/qa_fast_atan2f.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-runtime/lib/math/qa_fast_atan2f.cc b/gnuradio-runtime/lib/math/qa_fast_atan2f.cc index 154998f79a..9584a578a1 100644 --- a/gnuradio-runtime/lib/math/qa_fast_atan2f.cc +++ b/gnuradio-runtime/lib/math/qa_fast_atan2f.cc @@ -31,9 +31,9 @@ #include <limits> #ifdef _MSC_VER -#define isnan _isnan +#define ISNAN _isnan #else -using std::isnan; +#define ISNAN std::isnan #endif void @@ -98,7 +98,7 @@ qa_fast_atan2f::t2() x = inf; y = inf; gr_atan2f = gr::fast_atan2f(y, x); - CPPUNIT_ASSERT(isnan(gr_atan2f)); + CPPUNIT_ASSERT(ISNAN(gr_atan2f)); /* Test x as NAN */ @@ -128,10 +128,10 @@ qa_fast_atan2f::t2() x = inf; y = nan; gr_atan2f = gr::fast_atan2f(y, x); - CPPUNIT_ASSERT(isnan(gr_atan2f)); + CPPUNIT_ASSERT(ISNAN(gr_atan2f)); x = nan; y = inf; gr_atan2f = gr::fast_atan2f(y, x); - CPPUNIT_ASSERT(isnan(gr_atan2f)); + CPPUNIT_ASSERT(ISNAN(gr_atan2f)); } |