Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-core / src / lib / runtime / gr_complex.h

diff --git a/gnuradio-core/src/lib/runtime/gr_complex.h b/gnuradio-core/src/lib/runtime/gr_complex.h
index 732aa997df5a208b6094803f65e69300bb886947..32e996eef9db00d12e75f9ac2884643a2c03d6ad 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_complex.h
+++ b/gnuradio-core/src/lib/runtime/gr_complex.h
@@ -6,7 +6,7 @@
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -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);