From d07bef3cadb8df68cbb2b7394e8c8b33d9973808 Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Wed, 18 Dec 2019 21:04:08 +0100
Subject: [PATCH] C++11 is the standard to be used for all adapters (acc. to
 Volker)

---
 Makefile.conf          | 4 ++--
 android/jni/Android.mk | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.conf b/Makefile.conf
index 2a43844..2624aea 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -24,9 +24,9 @@ LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
 
 ######### C++ #########
 ifeq ($(BUILD_FOR),Linux)
-    CXX=g++ -std=c++14
+    CXX=g++ -std=c++11
 else ifeq ($(BUILD_FOR),Darwin)
-    CXX=clang -std=c++14
+    CXX=clang -std=c++11
 endif
 
 ifeq ($(BUILD_FOR),Linux)
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 4a800e7..b3d1193 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -45,7 +45,7 @@ LOCAL_MODULE     := pEpJNI
 LOCAL_SHARED_LIBRARIES :=  libnettle libhogweed libgmp
 LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid pEpAdapter libsequoia_openpgp_ffi
 LOCAL_CPP_FEATURES += exceptions
-LOCAL_CPPFLAGS += -std=c++14 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC -fuse-ld=lld
+LOCAL_CPPFLAGS += -std=c++11 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC -fuse-ld=lld
 LOCAL_SRC_FILES  := \
 		  ../../src/foundation_pEp_jniadapter_AbstractEngine.cc \
 		  ../../src/foundation_pEp_jniadapter_Engine.cc \