diff options
| author | JF002 <JF002@users.noreply.github.com> | 2021-03-31 18:33:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 18:33:37 (GMT) |
| commit | 58a2d000c4d49d96121894d6dd6bb861d7564bea (patch) | |
| tree | e4a941aa36b6db254426bed309c48dd42d79dfd5 /src/main.cpp | |
| parent | 136d4bb85e36777f0f9877fd065476ba1c02ca90 (diff) | |
| parent | 8eb947a2239d431146de9295e281ee0163fa20e2 (diff) | |
Merge pull request #238 from nscooling/make_unique
Resolved C++14 Cmake build issues so correctly building to C99/C++14
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index b29aac7..bd4bbe7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -49,6 +49,8 @@ Pinetime::Logging::NrfLogger logger; Pinetime::Logging::DummyLogger logger; #endif +#include <memory> + static constexpr uint8_t pinSpiSck = 2; static constexpr uint8_t pinSpiMosi = 3; static constexpr uint8_t pinSpiMiso = 4; @@ -254,8 +256,8 @@ int main(void) { debounceTimer = xTimerCreate ("debounceTimer", 200, pdFALSE, (void *) 0, DebounceTimerCallback); - systemTask.reset(new Pinetime::System::SystemTask(spi, lcd, spiNorFlash, twiMaster, touchPanel, lvgl, batteryController, bleController, - dateTimeController, motorController, heartRateSensor, settingsController)); + systemTask = std::make_unique<Pinetime::System::SystemTask>(spi, lcd, spiNorFlash, twiMaster, touchPanel, lvgl, batteryController, bleController, + dateTimeController, motorController, heartRateSensor, settingsController); systemTask->Start(); nimble_port_init(); |
