diff options
| -rw-r--r-- | gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc | 6 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_complex.h | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc b/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc index 7c0003c1f..aee0e4614 100644 --- a/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc +++ b/gnuradio-core/src/lib/filter/qa_gr_fir_ccc.cc @@ -148,9 +148,9 @@ test_random_io (fir_maker_t maker) // arithmetic. for (int o = 0; o < ol; o++){ - ASSERT_COMPLEXES_EQUAL (expected_output[o], - actual_output[o], - abs (expected_output[o]) * ERR_DELTA); + CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected_output[o], + actual_output[o], + abs (expected_output[o]) * ERR_DELTA); } delete f1; diff --git a/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc b/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc index 1af7c91fc..1d57cd0cd 100644 --- a/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc +++ b/gnuradio-core/src/lib/filter/qa_gr_fir_ccf.cc @@ -147,8 +147,8 @@ test_random_io (fir_maker_t maker) // arithmetic. for (int o = 0; o < ol; o++){ - ASSERT_COMPLEXES_EQUAL (expected_output[o], actual_output[o], - abs (expected_output[o]) * ERR_DELTA); + CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected_output[o], actual_output[o], + abs (expected_output[o]) * ERR_DELTA); } delete f1; diff --git a/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc b/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc index 5163a0e14..93b84b9c3 100644 --- a/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc +++ b/gnuradio-core/src/lib/filter/qa_gr_fir_fcc.cc @@ -146,9 +146,9 @@ test_random_io (fir_maker_t maker) // arithmetic. for (int o = 0; o < ol; o++){ - ASSERT_COMPLEXES_EQUAL (expected_output[o], - actual_output[o], - abs (expected_output[o]) * ERR_DELTA); + CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected_output[o], + actual_output[o], + abs (expected_output[o]) * ERR_DELTA); } delete f1; diff --git a/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc b/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc index ddbbf9c6e..1aea34fbb 100644 --- a/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc +++ b/gnuradio-core/src/lib/filter/qa_gr_fir_scc.cc @@ -145,9 +145,9 @@ test_random_io (fir_maker_t maker) // arithmetic. for (int o = 0; o < ol; o++){ - ASSERT_COMPLEXES_EQUAL (expected_output[o], - actual_output[o], - abs (expected_output[o]) * ERR_DELTA); + CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected_output[o], + actual_output[o], + abs (expected_output[o]) * ERR_DELTA); } delete f1; diff --git a/gnuradio-core/src/lib/runtime/gr_complex.h b/gnuradio-core/src/lib/runtime/gr_complex.h index f705d95dc..32e996eef 100644 --- a/gnuradio-core/src/lib/runtime/gr_complex.h +++ b/gnuradio-core/src/lib/runtime/gr_complex.h @@ -38,7 +38,7 @@ inline bool is_complex (short x) { return false;} // this doesn't really belong here, but there are worse places for it... -#define ASSERT_COMPLEXES_EQUAL(expected,actual,delta) \ +#define CPPUNIT_ASSERT_COMPLEXES_EQUAL(expected,actual,delta) \ CPPUNIT_ASSERT_DOUBLES_EQUAL (expected.real(), actual.real(), delta); \ CPPUNIT_ASSERT_DOUBLES_EQUAL (expected.imag(), actual.imag(), delta); |