Merge pull request #238 from nscooling/make_unique

Resolved C++14 Cmake build issues so correctly building to C99/C++14

1 files changed, 5 insertions, 3 deletions

diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 19a416ba..7b137f55 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -23,6 +23,8 @@
 #include "drivers/Hrs3300.h"
 #include "main.h"
 
+#include <memory>
+
 using namespace Pinetime::System;
 
 void IdleTimerCallback(TimerHandle_t xTimer) {
@@ -86,9 +88,9 @@ void SystemTask::Work() {
   settingsController.Init();
 
 
-  displayApp.reset(new Pinetime::Applications::DisplayApp(lcd, lvgl, touchPanel, batteryController, bleController,
+  displayApp =  std::make_unique<Pinetime::Applications::DisplayApp>(lcd, lvgl, touchPanel, batteryController, bleController,
                                                           dateTimeController, watchdogView, *this, notificationManager,
-                                                          heartRateController, settingsController));
+                                                          heartRateController, settingsController);
   displayApp->Start();
 
   batteryController.Update();
@@ -96,7 +98,7 @@ void SystemTask::Work() {
 
   heartRateSensor.Init();
   heartRateSensor.Disable();
-  heartRateApp.reset(new Pinetime::Applications::HeartRateTask(heartRateSensor, heartRateController));
+  heartRateApp = std::make_unique<Pinetime::Applications::HeartRateTask>(heartRateSensor, heartRateController);
   heartRateApp->Start();