Control: tags -1 patch
Control: user -1 debian-...@lists.debian.org
<mailto:debian-...@lists.debian.org>
Control: usertag -1 ftbfs-gcc-6
Hi Maintainer
The attached patch fixes the FTBFS with GCC 6.
Regards
Graham
Description: Fix FTBFS with GCC 6
Change 'const' to 'constexpr' for in-class initialization of floats.
Bug-Debian: https://bugs.debian.org/834292
Author: Graham Inggs <gin...@debian.org>
Last-Update: 2016-08-19
--- a/lib/estimator_cw_impl.h
+++ b/lib/estimator_cw_impl.h
@@ -46,7 +46,7 @@
pmt::pmt_t d_vel_key, d_vel_value, d_vel_pack, d_value;
pmt::pmt_t d_time_key, d_time_value, d_time_pack;
- const static float c_light = 3e8;
+ constexpr static float c_light = 3e8;
};
} // namespace radar
--- a/lib/static_target_simulator_cc_impl.h
+++ b/lib/static_target_simulator_cc_impl.h
@@ -68,7 +68,7 @@
uint64_t d_time_sec;
double d_time_frac_sec;
- const static float c_light = 3e8;
+ constexpr static float c_light = 3e8;
// Where all the action really happens
int work(int noutput_items,
--- a/lib/estimator_fsk_impl.h
+++ b/lib/estimator_fsk_impl.h
@@ -49,7 +49,7 @@
std::vector<float> d_range;
pmt::pmt_t d_range_key, d_range_value, d_range_pack;
- const static float c_light = 3e8;
+ constexpr static float c_light = 3e8;
};
--- a/lib/estimator_fmcw_impl.h
+++ b/lib/estimator_fmcw_impl.h
@@ -52,7 +52,7 @@
pmt::pmt_t d_port_id_in_cw, d_port_id_in_up, d_port_id_in_down, d_port_id_out;
pmt::pmt_t d_msg_cw, d_msg_up, d_msg_down;
- const static float c_light = 3e8;
+ constexpr static float c_light = 3e8;
};
--- a/lib/estimator_rcs_impl.h
+++ b/lib/estimator_rcs_impl.h
@@ -58,7 +58,7 @@
std::vector<float> d_range, d_power, d_rcs;
std::vector<pmt::pmt_t> d_msg_hold;
- const static float c_light = 3e8;
+ constexpr static float c_light = 3e8;
};
