From c6fc6eb02089c1b880e7aea9de476c785c8648d0 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 20 Feb 2020 10:50:12 +0100
Subject: [PATCH] Apply performance-type-promotion-in-math-fn fix.

Remove unused include, reorder header
---
 src/algorithms/acquisition/libs/acq_conf.cc | 3 ++-
 src/algorithms/acquisition/libs/acq_conf.h  | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/algorithms/acquisition/libs/acq_conf.cc b/src/algorithms/acquisition/libs/acq_conf.cc
index 8c776ffe4..3982b0dc8 100644
--- a/src/algorithms/acquisition/libs/acq_conf.cc
+++ b/src/algorithms/acquisition/libs/acq_conf.cc
@@ -22,6 +22,7 @@
 #include "item_type_helpers.h"
 #include <glog/logging.h>
 #include <gnuradio/gr_complex.h>
+#include <cmath>
 
 Acq_Conf::Acq_Conf()
 {
@@ -148,6 +149,6 @@ void Acq_Conf::ConfigureAutomaticResampler(double opt_freq)
 void Acq_Conf::SetDerivedParams()
 {
     samples_per_ms = static_cast<float>(resampled_fs) * 0.001;
-    samples_per_chip = static_cast<unsigned int>(ceil(static_cast<float>(resampled_fs) / chips_per_second));
+    samples_per_chip = static_cast<unsigned int>(std::ceil(static_cast<float>(resampled_fs) / chips_per_second));
     samples_per_code = samples_per_ms * ms_per_code;
 }
diff --git a/src/algorithms/acquisition/libs/acq_conf.h b/src/algorithms/acquisition/libs/acq_conf.h
index b1e26d0f2..12d8d5957 100644
--- a/src/algorithms/acquisition/libs/acq_conf.h
+++ b/src/algorithms/acquisition/libs/acq_conf.h
@@ -22,13 +22,16 @@
 #define GNSS_SDR_ACQ_CONF_H
 
 #include "configuration_interface.h"
-#include <cstddef>
 #include <cstdint>
 #include <string>
 
 class Acq_Conf
 {
 public:
+    Acq_Conf();
+
+    void SetFromConfiguration(ConfigurationInterface *configuration, const std::string &role, double chip_rate, double opt_freq);
+
     /* PCPS Acquisition configuration */
     uint32_t sampled_ms;
     uint32_t ms_per_code;
@@ -60,10 +63,6 @@ public:
     size_t it_size;
     std::string item_type;
 
-    Acq_Conf();
-
-    void SetFromConfiguration(ConfigurationInterface *configuration, const std::string &role, double chip_rate, double opt_freq);
-
 private:
     void SetDerivedParams();