From 01ecb05341e224ff4639a6eabeb376a65ca49c35 Mon Sep 17 00:00:00 2001 From: Alessandro Simovic Date: Fri, 5 Jan 2018 17:58:06 +0100 Subject: [PATCH] snapdragon: changed constexpr to const in FlightTask so that it would compile --- src/lib/FlightTasks/tasks/FlightTask.cpp | 3 +-- src/lib/FlightTasks/tasks/FlightTask.hpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/FlightTasks/tasks/FlightTask.cpp b/src/lib/FlightTasks/tasks/FlightTask.cpp index aae21f2507..3949cf859b 100644 --- a/src/lib/FlightTasks/tasks/FlightTask.cpp +++ b/src/lib/FlightTasks/tasks/FlightTask.cpp @@ -2,8 +2,7 @@ #include constexpr uint64_t FlightTask::_timeout; -constexpr vehicle_local_position_setpoint_s FlightTask::empty_setpoint; - +const vehicle_local_position_setpoint_s FlightTask::empty_setpoint = {0, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN}; bool FlightTask::initializeSubscriptions(SubscriptionArray &subscription_array) { diff --git a/src/lib/FlightTasks/tasks/FlightTask.hpp b/src/lib/FlightTasks/tasks/FlightTask.hpp index a7ba351fbc..b85489ac52 100644 --- a/src/lib/FlightTasks/tasks/FlightTask.hpp +++ b/src/lib/FlightTasks/tasks/FlightTask.hpp @@ -99,7 +99,7 @@ public: return _vehicle_local_position_setpoint; } - static constexpr vehicle_local_position_setpoint_s empty_setpoint = {0, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN}; + static const vehicle_local_position_setpoint_s empty_setpoint; protected: /* Time abstraction */