diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-17 11:26:26 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-03-17 11:26:26 -0700 |
| commit | 2273c29ef83f420b69c233e8c59a190786965256 (patch) | |
| tree | 37aee337e6f4e6f7a6627c4a0cf50291fb989e94 /gr-digital/swig | |
| parent | 710f3dccddcd1096e3b14899d589b96da39c1dd8 (diff) | |
| parent | 3e4924f28cde6e543fec6f4f1c742e782f61cf14 (diff) | |
Merge branch 'master' into next
Conflicts:
config/grc_gruel.m4
Diffstat (limited to 'gr-digital/swig')
| -rw-r--r-- | gr-digital/swig/digital_constellation.i | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gr-digital/swig/digital_constellation.i b/gr-digital/swig/digital_constellation.i index acc7aad1a0..248f900149 100644 --- a/gr-digital/swig/digital_constellation.i +++ b/gr-digital/swig/digital_constellation.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010, 2011 Free Software Foundation, Inc. + * Copyright 2010,2011,2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -188,6 +188,7 @@ public: digital_constellation_8psk (); }; +#if SWIGPYTHON /* We want print(constellation) in python to produce nice useful output so we include code at the end of the generated python file that overrides @@ -204,3 +205,4 @@ digital_constellation_dqpsk_sptr.__repr__ = lambda self: '<constellation dqpsk>' digital_constellation_8psk_sptr.__repr__ = lambda self: '<constellation 8psk>' %} +#endif |