Clean usage of Guidelines Support Library

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc

@@ -41,8 +41,8 @@
 #include "gps_sdr_signal_processing.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <algorithm>
 #include <gsl/gsl>
+#include <algorithm>
 
 
 GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h

@@ -65,6 +65,7 @@
 #include <gnuradio/gr_complex.h>     // for gr_complex
 #include <gnuradio/thread/thread.h>  // for scoped_lock
 #include <gnuradio/types.h>          // for gr_vector_const_void_star
+#include <gsl/gsl>                   // for Guidelines Support Library
 #include <volk/volk_complex.h>       // for lv_16sc_t
 #include <complex>
 #include <cstdint>
@@ -72,12 +73,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#if HAS_SPAN
-#include <span>
-namespace gsl = std;
-#else
-#include <gsl/gsl>
-#endif
 
 class Gnss_Synchro;
 class pcps_acquisition;