From a603fe3d18bddfd47433f898011ca0a7db4bb91f Mon Sep 17 00:00:00 2001 From: Tristan Krause Date: Wed, 15 May 2019 10:55:32 +0200 Subject: [PATCH] fallthough --- driver/src/Makefile | 2 +- driver/src/ui/view_monitor.cpp | 2 +- driver/src/ui/view_promt.cpp | 2 +- driver/src/ui/view_selection.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/driver/src/Makefile b/driver/src/Makefile index 9c3e8d2..246a996 100644 --- a/driver/src/Makefile +++ b/driver/src/Makefile @@ -11,7 +11,7 @@ OUT_MAIN = main.elf OBJ_MAIN = main.o OUT_CLI = cli.elf OBJ_CLI = cli.o -CFLAGS = -std=c++14 -O3 -Wall -Wextra +CFLAGS = -std=c++17 -O3 -Wall -Wextra LDFLAGS = -lcurses -lpthread OBJECTS_DRV = drv/usart.o drv/b15f.o drv/plottyfile.o drv/dot.o OBJECTS_UI = ui/view.o ui/view_selection.o ui/view_promt.o ui/view_info.o ui/view_monitor.o ui/ui.o diff --git a/driver/src/ui/view_monitor.cpp b/driver/src/ui/view_monitor.cpp index ea8b083..8697eef 100644 --- a/driver/src/ui/view_monitor.cpp +++ b/driver/src/ui/view_monitor.cpp @@ -26,7 +26,7 @@ call_t ViewMonitor::keypress(int& key) break; // fall through to next case - __attribute__ ((fallthrough)); + [[fallthrough]]; } case KEY_ENT: run_worker = false; diff --git a/driver/src/ui/view_promt.cpp b/driver/src/ui/view_promt.cpp index 57ab60d..6073d04 100644 --- a/driver/src/ui/view_promt.cpp +++ b/driver/src/ui/view_promt.cpp @@ -100,7 +100,7 @@ std::function ViewPromt::keypress(int& key) break; // fall through to next case - __attribute__ ((fallthrough)); + [[fallthrough]]; } case KEY_ENT: if(selection == 0) // exit diff --git a/driver/src/ui/view_selection.cpp b/driver/src/ui/view_selection.cpp index 5b947bd..f28af8c 100644 --- a/driver/src/ui/view_selection.cpp +++ b/driver/src/ui/view_selection.cpp @@ -59,7 +59,7 @@ call_t ViewSelection::keypress(int& key) break; // fall through to next case - __attribute__ ((fallthrough)); + [[fallthrough]]; } case KEY_ENT: