projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.3.1' into try-3.3.1
[debian/gnuradio]
/
gnuradio-core
/
src
/
lib
/
gengen
/
gr_multiply_XX.cc.t
diff --git
a/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t
b/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t
index 000c5e0bd88f87309ebfd2a1e9428a452bd61476..5d270c763487b3ad58106b3ffb63654e7da600f4 100644
(file)
--- a/
gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t
+++ b/
gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t
@@
-1,6
+1,6
@@
/* -*- c++ -*- */
/*
/* -*- c++ -*- */
/*
- * Copyright 2004, 2009 Free Software Foundation, Inc.
+ * Copyright 2004, 2009
,2010
Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
*
* This file is part of GNU Radio
*
@@
-32,7
+32,7
@@
@SPTR_NAME@
gr_make_@BASE_NAME@ (size_t vlen)
{
@SPTR_NAME@
gr_make_@BASE_NAME@ (size_t vlen)
{
- return
@SPTR_NAME@
(new @NAME@ (vlen));
+ return
gnuradio::get_initial_sptr
(new @NAME@ (vlen));
}
@NAME@::@NAME@ (size_t vlen)
}
@NAME@::@NAME@ (size_t vlen)
@@
-52,7
+52,7
@@
int
int ninputs = input_items.size ();
int ninputs = input_items.size ();
- for (
in
t i = 0; i < noutput_items*d_vlen; i++){
+ for (
size_
t i = 0; i < noutput_items*d_vlen; i++){
@I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i];
for (int j = 1; j < ninputs; j++)
acc *= ((@I_TYPE@ *) input_items[j])[i];
@I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i];
for (int j = 1; j < ninputs; j++)
acc *= ((@I_TYPE@ *) input_items[j])[i];