[hamradio-commits] [gnss-sdr] 32/149: Include cleaning

[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 5abc7b8b6aa87e9cbf97f1e7593aa5c1606711ba
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Jan 5 15:35:33 2016 +0100

    Include cleaning
---
 src/algorithms/channel/adapters/channel.cc           | 20 +++++---------------
 src/algorithms/channel/adapters/channel.h            |  5 ++---
 src/algorithms/channel/libs/channel_fsm.cc           |  7 +++++--
 src/algorithms/channel/libs/channel_fsm.h            | 11 +----------
 .../conditioner/adapters/array_signal_conditioner.cc |  7 -------
 .../conditioner/adapters/array_signal_conditioner.h  |  1 -
 .../conditioner/adapters/signal_conditioner.cc       |  7 -------
 .../conditioner/adapters/signal_conditioner.h        |  1 -
 8 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc
index 0360e3b..6269bc8 100644
--- a/src/algorithms/channel/adapters/channel.cc
+++ b/src/algorithms/channel/adapters/channel.cc
@@ -30,22 +30,12 @@
  */
 
 #include "channel.h"
-#include <cstring>
-#include <iostream>
-#include <sstream>
 #include <boost/lexical_cast.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/chrono.hpp>
 #include <glog/logging.h>
-#include <gnuradio/io_signature.h>
-#include <gnuradio/message.h>
 #include "acquisition_interface.h"
 #include "tracking_interface.h"
 #include "telemetry_decoder_interface.h"
 #include "configuration_interface.h"
-#include "gnss_flowgraph.h"
-
 
 
 
@@ -197,7 +187,7 @@ void Channel::start_acquisition()
 
 void Channel::start()
 {
-    ch_thread_ = boost::thread(&Channel::run, this);
+    ch_thread_ = std::thread(&Channel::run, this);
 }
 
 
@@ -228,14 +218,14 @@ void Channel::stop()
 {
     stop_ = true;
     channel_internal_queue_.push(0); //message to stop channel
-    /* When the boost::thread object that represents a thread of execution
+    /* When the std::thread object that represents a thread of execution
      * is destroyed the thread becomes detached. Once a thread is detached,
      * it will continue executing until the invocation of the function or
      * callable object supplied on construction has completed,
      * or the program is terminated. In order to wait for a thread of
-     * execution to finish, the join() or timed_join() member functions of
-     * the boost::thread object must be used. join() will block the calling
-     * thread until the thread represented by the boost::thread object
+     * execution to finish, the join() member function of
+     * the std::thread object must be used. join() will block the calling
+     * thread until the thread represented by the std::thread object
      * has completed.
      */
     ch_thread_.join();
diff --git a/src/algorithms/channel/adapters/channel.h b/src/algorithms/channel/adapters/channel.h
index 2008d40..215e7c7 100644
--- a/src/algorithms/channel/adapters/channel.h
+++ b/src/algorithms/channel/adapters/channel.h
@@ -36,12 +36,11 @@
 #define GNSS_SDR_CHANNEL_H_
 
 #include <string>
+#include <thread>
 #include <gnuradio/msg_queue.h>
 #include "channel_interface.h"
 #include "channel_fsm.h"
-#include "control_message_factory.h"
 #include "concurrent_queue.h"
-#include "gnss_signal.h"
 #include "gnss_synchro.h"
 
 
@@ -107,7 +106,7 @@ private:
     ChannelFsm channel_fsm_;
     boost::shared_ptr<gr::msg_queue> queue_;
     concurrent_queue<int> channel_internal_queue_;
-    boost::thread ch_thread_;
+    std::thread ch_thread_;
     void run();
     void process_channel_messages();
 };
diff --git a/src/algorithms/channel/libs/channel_fsm.cc b/src/algorithms/channel/libs/channel_fsm.cc
index 6d208b6..dcfc0ca 100644
--- a/src/algorithms/channel/libs/channel_fsm.cc
+++ b/src/algorithms/channel/libs/channel_fsm.cc
@@ -29,11 +29,14 @@
  */
 
 #include "channel_fsm.h"
-#include <list>
 #include <memory>
+#include <boost/statechart/simple_state.hpp>
+#include <boost/statechart/state.hpp>
+#include <boost/statechart/transition.hpp>
+#include <boost/statechart/custom_reaction.hpp>
+#include <boost/mpl/list.hpp>
 #include <glog/logging.h>
 #include "control_message_factory.h"
-#include "channel.h"
 
 
 struct Ev_channel_start_acquisition: sc::event<Ev_channel_start_acquisition>
diff --git a/src/algorithms/channel/libs/channel_fsm.h b/src/algorithms/channel/libs/channel_fsm.h
index 6540cf7..95d7b7d 100644
--- a/src/algorithms/channel/libs/channel_fsm.h
+++ b/src/algorithms/channel/libs/channel_fsm.h
@@ -32,17 +32,8 @@
 #ifndef GNSS_SDR_CHANNEL_FSM_H
 #define GNSS_SDR_CHANNEL_FSM_H
 
-#include <cstring>
-#include <iostream>
-#include <queue>
+
 #include <boost/statechart/state_machine.hpp>
-#include <boost/statechart/simple_state.hpp>
-#include <boost/statechart/state.hpp>
-#include <boost/statechart/transition.hpp>
-#include <boost/statechart/custom_reaction.hpp>
-#include <boost/mpl/list.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <gnuradio/msg_queue.h>
 #include "acquisition_interface.h"
 #include "tracking_interface.h"
diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc
index 9350cad..5a826da 100644
--- a/src/algorithms/conditioner/adapters/array_signal_conditioner.cc
+++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.cc
@@ -30,14 +30,7 @@
  */
 
 #include "array_signal_conditioner.h"
-#include <iostream>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <boost/thread/thread.hpp>
-#include <gnuradio/io_signature.h>
-#include <gnuradio/message.h>
 #include <glog/logging.h>
-#include "gnss_flowgraph.h"
 
 
 using google::LogMessage;
diff --git a/src/algorithms/conditioner/adapters/array_signal_conditioner.h b/src/algorithms/conditioner/adapters/array_signal_conditioner.h
index 3936e06..3dbb59b 100644
--- a/src/algorithms/conditioner/adapters/array_signal_conditioner.h
+++ b/src/algorithms/conditioner/adapters/array_signal_conditioner.h
@@ -36,7 +36,6 @@
 #include <string>
 #include <gnuradio/msg_queue.h>
 #include "gnss_block_interface.h"
-#include "control_message_factory.h"
 
 
 class ConfigurationInterface;
diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.cc b/src/algorithms/conditioner/adapters/signal_conditioner.cc
index cd7b611..3a57e38 100644
--- a/src/algorithms/conditioner/adapters/signal_conditioner.cc
+++ b/src/algorithms/conditioner/adapters/signal_conditioner.cc
@@ -30,14 +30,7 @@
  */
 
 #include "signal_conditioner.h"
-#include <iostream>
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <boost/thread/thread.hpp>
-#include <gnuradio/io_signature.h>
-#include <gnuradio/message.h>
 #include <glog/logging.h>
-#include "gnss_flowgraph.h"
 
 
 using google::LogMessage;
diff --git a/src/algorithms/conditioner/adapters/signal_conditioner.h b/src/algorithms/conditioner/adapters/signal_conditioner.h
index 31e2f1a..41201a4 100644
--- a/src/algorithms/conditioner/adapters/signal_conditioner.h
+++ b/src/algorithms/conditioner/adapters/signal_conditioner.h
@@ -35,7 +35,6 @@
 #include <string>
 #include <gnuradio/msg_queue.h>
 #include "gnss_block_interface.h"
-#include "control_message_factory.h"
 
 
 class ConfigurationInterface;

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