diff options
author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-12-31 12:55:04 -0800 |
---|---|---|
committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-12-31 12:55:04 -0800 |
commit | 69f57364c5b8fc575b6a956468025da37d32b1a6 (patch) | |
tree | c188ee8e4d2c56817ed6c4c8330bd0ebbf4778e9 /gnuradio-core/src/lib/runtime/gr_complex.h | |
parent | d2ffdf9044987d53445dd50387ec747b4437ffc3 (diff) | |
parent | 79284e93f738d389b452f8829bf4876d3fd513b4 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/lib/runtime/gr_complex.h')
-rw-r--r-- | gnuradio-core/src/lib/runtime/gr_complex.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_complex.h b/gnuradio-core/src/lib/runtime/gr_complex.h index 7580021064..58d1525b4d 100644 --- a/gnuradio-core/src/lib/runtime/gr_complex.h +++ b/gnuradio-core/src/lib/runtime/gr_complex.h @@ -27,13 +27,13 @@ typedef std::complex<float> gr_complex; typedef std::complex<double> gr_complexd; -inline bool is_complex (gr_complex x) { return true;} -inline bool is_complex (gr_complexd x) { return true;} -inline bool is_complex (float x) { return false;} -inline bool is_complex (double x) { return false;} -inline bool is_complex (int x) { return false;} -inline bool is_complex (char x) { return false;} -inline bool is_complex (short x) { return false;} +inline bool is_complex (gr_complex x) { (void) x; return true;} +inline bool is_complex (gr_complexd x) { (void) x; return true;} +inline bool is_complex (float x) { (void) x; return false;} +inline bool is_complex (double x) { (void) x; return false;} +inline bool is_complex (int x) { (void) x; return false;} +inline bool is_complex (char x) { (void) x; return false;} +inline bool is_complex (short x) { (void) x; return false;} // this doesn't really belong here, but there are worse places for it... |