Merge branch 'synfilt'

[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 242b2f54d4f9521e6b1d0c4679785cacfbc79eed..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,
@@ -16,8 +16,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
  */
 #ifndef INCLUDED_GR_COMPLEX_H
 #define INCLUDED_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);