Merged r10539:10546 from michaelld/two_mods into trunk. Trunk passes distcheck.

[debian/gnuradio] / gnuradio-core / src / lib / gengen / generate_common.py

diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py
index 182b74070edfcc80d4717b64a59537c972c56d92..992e2c0da53d41e3b6548a67ac48f3912d006bca 100755 (executable)
--- a/gnuradio-core/src/lib/gengen/generate_common.py
+++ b/gnuradio-core/src/lib/gengen/generate_common.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -62,6 +62,7 @@ others = (
     ('gr_packed_to_unpacked_XX',    ('bb','ss','ii')),
     ('gr_xor_XX',                   ('bb','ss','ii')),
     ('gr_and_XX',                   ('bb','ss','ii')),
+    ('gr_and_const_XX',             ('bb','ss','ii')),
     ('gr_or_XX',                    ('bb','ss','ii')),
     ('gr_not_XX',                   ('bb','ss','ii')),
     ('gr_sample_and_hold_XX',       ('bb','ss','ii','ff')),