[hamradio-commits] [gnss-sdr] 90/149: Merge branch 'new_volk_module' of git+ssh://github.com/gnss-sdr/gnss-sdr into new_volk_module

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit c7193e394e5549d962a844f04d8fecd92755bafc
Merge: 9bf8b17 07feeee
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Jan 20 18:18:32 2016 +0100

    Merge branch 'new_volk_module' of git+ssh://github.com/gnss-sdr/gnss-sdr
    into new_volk_module
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 .../volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h  | 113 +++++++++++++++++++++
 .../volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h     |  24 ++---
 .../volk_gnsssdr/lib/kernel_tests.h                |   1 +
 3 files changed, 126 insertions(+), 12 deletions(-)

diff --cc src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h
index b36fd4c,b36fd4c..10fc07c
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h
@@@ -59,10 -59,10 +59,10 @@@ static inline void volk_gnsssdr_16ic_re
  
      memcpy(result, result_aux[0], sizeof(lv_16sc_t)*num_points);
      volk_gnsssdr_free(rem_code_phase_chips);
--    for(unsigned int n = 0; n < num_out_vectors; n++)
--    {
--        volk_gnsssdr_free(result_aux[n]);
--    }
++//    for(unsigned int n = 0; n < num_out_vectors; n++)
++//    {
++//        volk_gnsssdr_free(result_aux[n]);
++//    }
      volk_gnsssdr_free(result_aux);
  }
  
@@@ -85,10 -85,10 +85,10 @@@ static inline void volk_gnsssdr_16ic_re
  
      memcpy(result, result_aux[0], sizeof(lv_16sc_t)*num_points);
      volk_gnsssdr_free(rem_code_phase_chips);
--    for(unsigned int n = 0; n < num_out_vectors; n++)
--    {
--        volk_gnsssdr_free(result_aux[n]);
--    }
++//    for(unsigned int n = 0; n < num_out_vectors; n++)
++//    {
++//        volk_gnsssdr_free(result_aux[n]);
++//    }
      volk_gnsssdr_free(result_aux);
  }
  
@@@ -112,10 -112,10 +112,10 @@@ static inline void volk_gnsssdr_16ic_re
  
      memcpy(result, result_aux[0], sizeof(lv_16sc_t)*num_points);
      volk_gnsssdr_free(rem_code_phase_chips);
--    for(unsigned int n = 0; n < num_out_vectors; n++)
--    {
--        volk_gnsssdr_free(result_aux[n]);
--    }
++//    for(unsigned int n = 0; n < num_out_vectors; n++)
++//    {
++//        volk_gnsssdr_free(result_aux[n]);
++//    }
      volk_gnsssdr_free(result_aux);
  }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git