From e5c3b3978a8245e6c29bc67e8be0e3324e193cf4 Mon Sep 17 00:00:00 2001 From: Dario Date: Sun, 7 Jun 2020 18:44:51 +0200 Subject: [PATCH] move to CXX Flags to prevent warning by compiling c code, adding include for unix --- CMakeLists.txt | 2 +- src/cpp/lib/DataTypeConverter.cpp | 3 +++ src/cpp/lib/DataTypeConverter.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ecc32400..3093c4e80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0) project(Gradido_LoginServer C CXX) SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "bin" ) -add_definitions("-std=c++11") +SET ( CMAKE_CXX_FLAGS "-std=c++17" ) include_directories( "dependencies" diff --git a/src/cpp/lib/DataTypeConverter.cpp b/src/cpp/lib/DataTypeConverter.cpp index e8f6cde00..72db0ec58 100644 --- a/src/cpp/lib/DataTypeConverter.cpp +++ b/src/cpp/lib/DataTypeConverter.cpp @@ -3,6 +3,9 @@ #include #include "sodium.h" +// needed for memset in linux +#include + namespace DataTypeConverter { NumberParseState strToInt(const std::string& input, int& result) diff --git a/src/cpp/lib/DataTypeConverter.h b/src/cpp/lib/DataTypeConverter.h index 7777d4b29..5ca654802 100644 --- a/src/cpp/lib/DataTypeConverter.h +++ b/src/cpp/lib/DataTypeConverter.h @@ -4,6 +4,7 @@ #include #include "../SingletonManager/MemoryManager.h" + namespace DataTypeConverter { enum NumberParseState