From e571ca7f1cea63a37c13e0d570b10aa2b78ee99c Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Fri, 17 Jul 2015 12:07:38 -0700 Subject: [PATCH] Change reference initializations errors in GCC 4.8 Resolves issue #12. --- firmware/application/main.cpp | 4 ++-- firmware/application/receiver_model.hpp | 2 +- firmware/application/ui_console.hpp | 2 +- firmware/application/ui_navigation.cpp | 2 +- firmware/application/ui_receiver.cpp | 2 +- firmware/baseband/dsp_decimate.hpp | 2 +- firmware/baseband/main.cpp | 2 +- firmware/common/ui_painter.hpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/application/main.cpp b/firmware/application/main.cpp index 77e36f0b..0cffc0b6 100755 --- a/firmware/application/main.cpp +++ b/firmware/application/main.cpp @@ -281,8 +281,8 @@ public: ui::Painter& painter, ui::Context& context ) : top_widget { top_widget }, - painter { painter }, - context { context } + painter(painter), + context(context) { // touch_manager.on_started = [this](const ui::TouchEvent event) { // this->context.focus_manager.update(this->top_widget, event); diff --git a/firmware/application/receiver_model.hpp b/firmware/application/receiver_model.hpp index f20877b6..d0dafee5 100644 --- a/firmware/application/receiver_model.hpp +++ b/firmware/application/receiver_model.hpp @@ -35,7 +35,7 @@ class ReceiverModel { public: constexpr ReceiverModel( ClockManager& clock_manager - ) : clock_manager { clock_manager } + ) : clock_manager(clock_manager) { } diff --git a/firmware/application/ui_console.hpp b/firmware/application/ui_console.hpp index b899232b..53ea3b0f 100644 --- a/firmware/application/ui_console.hpp +++ b/firmware/application/ui_console.hpp @@ -38,7 +38,7 @@ public: const Rect parent_rect, lcd::ILI9341& display ) : Widget { parent_rect }, - display { display } + display(display) { } diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 82b92df8..68e92833 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -119,7 +119,7 @@ SystemView::SystemView( Context& context, const Rect parent_rect ) : View { parent_rect }, - context_ { context } + context_(context) { style_ = &style_default; diff --git a/firmware/application/ui_receiver.cpp b/firmware/application/ui_receiver.cpp index 023fa875..bed999db 100644 --- a/firmware/application/ui_receiver.cpp +++ b/firmware/application/ui_receiver.cpp @@ -376,7 +376,7 @@ void LNAGainField::on_focus() { ReceiverView::ReceiverView( NavigationView& nav, ReceiverModel& receiver_model -) : receiver_model { receiver_model } +) : receiver_model(receiver_model) { add_children({ { &button_done, diff --git a/firmware/baseband/dsp_decimate.hpp b/firmware/baseband/dsp_decimate.hpp index 3172e34b..0e3a19f0 100644 --- a/firmware/baseband/dsp_decimate.hpp +++ b/firmware/baseband/dsp_decimate.hpp @@ -60,7 +60,7 @@ public: FIR64AndDecimateBy2Real( const std::array& taps - ) : taps { taps } + ) : taps(taps) { } diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp index d0b49f24..651c94aa 100755 --- a/firmware/baseband/main.cpp +++ b/firmware/baseband/main.cpp @@ -582,7 +582,7 @@ class FSKProcessor : public BasebandProcessor { public: FSKProcessor( MessageHandlerMap& message_handlers - ) : message_handlers { message_handlers } + ) : message_handlers(message_handlers) { message_handlers[Message::ID::FSKConfiguration] = [this](const Message* const p) { auto m = reinterpret_cast(p); diff --git a/firmware/common/ui_painter.hpp b/firmware/common/ui_painter.hpp index e31d5415..c10b2415 100644 --- a/firmware/common/ui_painter.hpp +++ b/firmware/common/ui_painter.hpp @@ -43,7 +43,7 @@ class Painter { public: Painter( lcd::ILI9341& display - ) : display_ { display } + ) : display_(display) { }