From 5e6e66e60b694cb8971d8b0df4ba9b4f6a207717 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 21 Jul 2013 22:18:19 +0000 Subject: [PATCH] fixing some errors on compiling the gn3s signal source git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@396 64b25241-fba3-4117-9849-534c7e92360d --- .../signal_source/adapters/gn3s_signal_source.cc | 8 +++----- .../signal_source/adapters/gn3s_signal_source.h | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc index 1840b7f86..d7cadc7a2 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.cc +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.cc @@ -39,16 +39,14 @@ using google::LogMessage; Gn3sSignalSource::Gn3sSignalSource(ConfigurationInterface* configuration, - std::string role, unsigned int in_stream, unsigned int out_stream, gr::blocks::file_sink::sptr queue) : + std::string role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue) { std::string default_item_type = "short"; std::string default_dump_file = "./data/gn3s_source.dat"; - item_type_ = configuration->property(role + ".item_type", - default_item_type); + item_type_ = configuration->property(role + ".item_type", default_item_type); dump_ = configuration->property(role + ".dump", false); - dump_filename_ = configuration->property(role + ".dump_filename", - default_dump_file); + dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); if (item_type_.compare("gr_complex") == 0) { diff --git a/src/algorithms/signal_source/adapters/gn3s_signal_source.h b/src/algorithms/signal_source/adapters/gn3s_signal_source.h index 07b7fd0ce..199b24ccd 100644 --- a/src/algorithms/signal_source/adapters/gn3s_signal_source.h +++ b/src/algorithms/signal_source/adapters/gn3s_signal_source.h @@ -35,6 +35,7 @@ #include #include "gnss_block_interface.h" #include +#include class ConfigurationInterface; @@ -46,7 +47,7 @@ class Gn3sSignalSource: public GNSSBlockInterface public: Gn3sSignalSource(ConfigurationInterface* configuration, std::string role, unsigned int in_stream, - unsigned int out_stream, boost::shared_ptr queue); + unsigned int out_stream, gr::msg_queue::sptr queue); virtual ~Gn3sSignalSource(); std::string role()