1 files changed, 57 insertions, 60 deletions
diff --git a/gr-blocks/lib/sub_impl.cc b/gr-blocks/lib/sub_impl.cc
index 5d618d3467..67ca84ec36 100644
--- a/gr-blocks/lib/sub_impl.cc
+++ b/gr-blocks/lib/sub_impl.cc
@@ -30,80 +30,77 @@
 #include <volk/volk.h>
 
 namespace gr {
-  namespace blocks {
-
-    template <class T>
-    typename sub<T>::sptr sub<T>::make(size_t vlen)
-    {
-      return gnuradio::get_initial_sptr(new sub_impl<T> (vlen));
-    }
-
-    template <>
-    sub_impl<float>::sub_impl(size_t vlen)
-      : sync_block("sub_ff",
-                   io_signature::make(1, -1, sizeof(float)*vlen),
-                   io_signature::make(1,  1, sizeof(float)*vlen)),
+namespace blocks {
+
+template <class T>
+typename sub<T>::sptr sub<T>::make(size_t vlen)
+{
+    return gnuradio::get_initial_sptr(new sub_impl<T>(vlen));
+}
+
+template <>
+sub_impl<float>::sub_impl(size_t vlen)
+    : sync_block("sub_ff",
+                 io_signature::make(1, -1, sizeof(float) * vlen),
+                 io_signature::make(1, 1, sizeof(float) * vlen)),
       d_vlen(vlen)
-    {
-      const int alignment_multiple =
-	volk_get_alignment() / sizeof(float);
-      set_alignment(std::max(1, alignment_multiple));
-    }
-
-    template <>
-    int
-    sub_impl<float>::work(int noutput_items,
-		      gr_vector_const_void_star &input_items,
-		      gr_vector_void_star &output_items)
-    {
-      float *out = (float*)output_items[0];
-
-      int ninputs = input_items.size();
-      int noi = noutput_items*d_vlen;
-
-      const float *in = (const float*)input_items[0];
-      memcpy(out, in, noi*sizeof(float));
-      for(int i = 1; i < ninputs; i++) {
+{
+    const int alignment_multiple = volk_get_alignment() / sizeof(float);
+    set_alignment(std::max(1, alignment_multiple));
+}
+
+template <>
+int sub_impl<float>::work(int noutput_items,
+                          gr_vector_const_void_star& input_items,
+                          gr_vector_void_star& output_items)
+{
+    float* out = (float*)output_items[0];
+
+    int ninputs = input_items.size();
+    int noi = noutput_items * d_vlen;
+
+    const float* in = (const float*)input_items[0];
+    memcpy(out, in, noi * sizeof(float));
+    for (int i = 1; i < ninputs; i++) {
         in = (const float*)input_items[i];
         volk_32f_x2_subtract_32f(out, out, in, noi);
-      }
-
-      return noutput_items;
     }
 
-    template <class T>
-    sub_impl<T> ::sub_impl(size_t vlen)
-      : sync_block ("sub",
-		       io_signature::make (1, -1, sizeof (T)*vlen),
-		       io_signature::make (1,  1, sizeof (T)*vlen)),
-      d_vlen(vlen)
-    {
-    }
+    return noutput_items;
+}
 
-    template <class T>
-    int
-    sub_impl<T> ::work(int noutput_items,
-		      gr_vector_const_void_star &input_items,
-		      gr_vector_void_star &output_items)
-    {
-      T *optr = (T *) output_items[0];
+template <class T>
+sub_impl<T>::sub_impl(size_t vlen)
+    : sync_block("sub",
+                 io_signature::make(1, -1, sizeof(T) * vlen),
+                 io_signature::make(1, 1, sizeof(T) * vlen)),
+      d_vlen(vlen)
+{
+}
 
-      int ninputs = input_items.size ();
+template <class T>
+int sub_impl<T>::work(int noutput_items,
+                      gr_vector_const_void_star& input_items,
+                      gr_vector_void_star& output_items)
+{
+    T* optr = (T*)output_items[0];
 
-      for (size_t i = 0; i < noutput_items*d_vlen; i++){
-	T acc = ((T *) input_items[0])[i];
-	for (int j = 1; j < ninputs; j++)
-	  acc -= ((T *) input_items[j])[i];
+    int ninputs = input_items.size();
 
-	*optr++ = (T) acc;
-      }
+    for (size_t i = 0; i < noutput_items * d_vlen; i++) {
+        T acc = ((T*)input_items[0])[i];
+        for (int j = 1; j < ninputs; j++)
+            acc -= ((T*)input_items[j])[i];
 
-      return noutput_items;
+        *optr++ = (T)acc;
     }
 
+    return noutput_items;
+}
+
 template class sub<std::int16_t>;
 template class sub<std::int32_t>;
 template class sub<gr_complex>;
 template class sub<float>;
-  } /* namespace blocks */
+} /* namespace blocks */
 } /* namespace gr */