From 8f52b04c9c40995a13153fdd424533febd3db183 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sat, 21 Jul 2018 13:57:14 +0200
Subject: [PATCH] Safer place for definition of namespaces

---
 src/algorithms/PVT/adapters/rtklib_pvt.cc      |  4 ++--
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc       | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index 339d2d15e..2d498d360 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -34,6 +34,8 @@
 #include "gnss_sdr_flags.h"
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
+#include <boost/serialization/map.hpp>
+#include <glog/logging.h>
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
@@ -41,8 +43,6 @@ namespace bc = boost::math;
 #include <boost/integer/common_factor_rt.hpp>
 namespace bc = boost::integer;
 #endif
-#include <boost/serialization/map.hpp>
-#include <glog/logging.h>
 
 
 using google::LogMessage;
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index 846d2f8f7..238ab0d2f 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -29,10 +29,19 @@
  */
 
 #include "rtklib_pvt_cc.h"
+#include "display.h"
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/exception/all.hpp>
+#include <boost/serialization/map.hpp>
+#include <glog/logging.h>
+#include <gnuradio/gr_complex.h>
+#include <gnuradio/io_signature.h>
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <exception>
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
@@ -40,15 +49,6 @@ namespace bc = boost::math;
 #include <boost/integer/common_factor_rt.hpp>
 namespace bc = boost::integer;
 #endif
-#include <boost/serialization/map.hpp>
-#include <glog/logging.h>
-#include <gnuradio/gr_complex.h>
-#include <gnuradio/io_signature.h>
-#include "display.h"
-#include <algorithm>
-#include <iostream>
-#include <map>
-#include <exception>
 
 
 using google::LogMessage;