From ebe4b905a5c46f8e82f0c4cc991b7383c4ffa151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Rathsman?= Date: Sat, 10 Aug 2024 08:36:15 +0200 Subject: [PATCH] Tell maike to not go above c++14. c++17 causes NRVO warnings. --- maikeconfig.json | 2 +- systemtargetinfo.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maikeconfig.json b/maikeconfig.json index 28058b0e..fa545adb 100644 --- a/maikeconfig.json +++ b/maikeconfig.json @@ -41,7 +41,7 @@ }, "cflags_extra":[], "cflags_format":"-^", - "cxxversion_max":-1, + "cxxversion_max":201402, "cxxversion_min":201103, "dllcompile":{ "args":[ diff --git a/systemtargetinfo.cpp b/systemtargetinfo.cpp index 85175b5c..b40a7299 100644 --- a/systemtargetinfo.cpp +++ b/systemtargetinfo.cpp @@ -136,5 +136,5 @@ ResourceObject SystemTargetInfo::configDump() const { ResourceObjectJansson ret(ResourceObject::Type::OBJECT); configDump(ret); - return ret; + return std::move(ret); } \ No newline at end of file