6 files changed, 15 insertions, 16 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t b/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t
index 3f8411d107..56a8b1b707 100644
--- a/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t
+++ b/gr-blocks/include/gnuradio/blocks/multiply_matrix_XX.h.t
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
-/* 
+/*
  * Copyright 2014 Free Software Foundation, Inc.
- * 
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
@@ -53,7 +53,7 @@ namespace gr {
      * to gr::blocks::@NAME@::TPP_SELECT_BY_MATRIX, a tag is propagated from input k
      * to output l if \f$(A)_{l,k} \neq 0\f$.
      *
-     * \section blocks_matrixmult_msgports Message Ports
+     * \section blocks_matrixmult_msgports_@NAME@ Message Ports
      *
      * This block as one input message port (\p set_A). A message sent to this port will
      * be converted to a std::vector<std::vector<@O_TYPE@> >, and then passed on to set_A().
@@ -100,4 +100,3 @@ namespace gr {
 } // namespace gr
 
 #endif /* @GUARD_NAME */
-
diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc
index 5272d8ab30..4fe86283e5 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/lib/SpectrumGUIClass.cc
@@ -266,10 +266,10 @@ SpectrumGUIClass::updateWindow(const bool updateDisplayFlag,
     }
 
     if((complexTimeDomainData != NULL) && (complexTimeDomainDataSize > 0)) {
-      volk_32fc_deinterleave_64f_x2_a(_realTimeDomainPoints,
-                                      _imagTimeDomainPoints,
-				      (const lv_32fc_t *)complexTimeDomainData,
-				      complexTimeDomainDataSize);
+      volk_32fc_deinterleave_64f_x2(_realTimeDomainPoints,
+                                    _imagTimeDomainPoints,
+                                    (const lv_32fc_t *)complexTimeDomainData,
+                                    complexTimeDomainDataSize);
       timeDomainBufferSize = complexTimeDomainDataSize;
     }
   }
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index e46b9db865..fa8e38dd9f 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -641,7 +641,7 @@ namespace gr {
             for(int x = 0; x < d_fftsize; x++) {
               d_magbufs[n][x] = (double)((1.0-d_fftavg)*d_magbufs[n][x] + (d_fftavg)*d_fbuf[x]);
             }
-            //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize);
+            //volk_32f_convert_64f(d_magbufs[n], d_fbuf, d_fftsize);
           }
 
           // Test trigger off signal power in d_magbufs
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index 200b009d79..1df915b32c 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -646,7 +646,7 @@ namespace gr {
             for(int x = 0; x < d_fftsize; x++) {
               d_magbufs[n][x] = (double)((1.0-d_fftavg)*d_magbufs[n][x] + (d_fftavg)*d_fbuf[x]);
             }
-            //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize);
+            //volk_32f_convert_64f(d_magbufs[n], d_fbuf, d_fftsize);
           }
 
           // Test trigger off signal power in d_magbufs
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index a9a2d6c09e..e5d43f4662 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -494,7 +494,7 @@ namespace gr {
               for(int x = 0; x < d_fftsize; x++) {
                 d_magbufs[n][x] = (double)((1.0-d_fftavg)*d_magbufs[n][x] + (d_fftavg)*d_fbuf[x]);
               }
-              //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize);
+              //volk_32f_convert_64f(d_magbufs[n], d_fbuf, d_fftsize);
             }
 
 	    d_last_time = gr::high_res_timer_now();
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index 0c1fbbff36..adae592bff 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -465,7 +465,7 @@ namespace gr {
         }
       }
     }
-    
+
     void
     waterfall_sink_f_impl::set_time_per_fft(double t)
     {
@@ -502,7 +502,7 @@ namespace gr {
               for(int x = 0; x < d_fftsize; x++) {
                 d_magbufs[n][x] = (double)((1.0-d_fftavg)*d_magbufs[n][x] + (d_fftavg)*d_fbuf[x]);
               }
-              //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize);
+              //volk_32f_convert_64f(d_magbufs[n], d_fbuf, d_fftsize);
             }
 
 	    d_last_time = gr::high_res_timer_now();