[hamradio-commits] [gnss-sdr] 12/44: adding a pass_through for all data types

[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 75ee6c1bf53309088ea944c1ac73a5481f77a7b2
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Feb 4 01:11:20 2015 +0100

    adding a pass_through for all data types
---
 src/algorithms/libs/CMakeLists.txt  |  1 +
 src/algorithms/libs/pass_through.cc | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index 657465a..752bd84 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -50,6 +50,7 @@ include_directories(
      ${GLOG_INCLUDE_DIRS}
      ${GFlags_INCLUDE_DIRS}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+     ${VOLK_INCLUDE_DIRS}
 )
 
 if(OPENCL_FOUND)
diff --git a/src/algorithms/libs/pass_through.cc b/src/algorithms/libs/pass_through.cc
index 758ce49..8b30c07 100644
--- a/src/algorithms/libs/pass_through.cc
+++ b/src/algorithms/libs/pass_through.cc
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <complex>
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include "configuration_interface.h"
 
 using google::LogMessage;
@@ -58,15 +59,19 @@ Pass_Through::Pass_Through(ConfigurationInterface* configuration, std::string ro
         }
     else if(item_type_.compare("short") == 0)
         {
-            item_size_ = sizeof(short);
+            item_size_ = sizeof(int16_t);
+        }
+    else if(item_type_.compare("cshort") == 0)
+        {
+            item_size_ = sizeof(lv_16sc_t);
         }
     else if(item_type_.compare("byte") == 0)
         {
-            item_size_ = sizeof(char);
+            item_size_ = sizeof(int8_t);
         }
     else if(item_type_.compare("cbyte") == 0)
         {
-            item_size_ = sizeof(std::complex<unsigned char>);
+            item_size_ = sizeof(lv_8sc_t);
         }
     else
         {

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