From 21f483b3917d116b4798cc235828f841fa196207 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@online.no>
Date: Sat, 17 Jun 2023 15:36:41 +0200
Subject: Set CMAKE_CXX_STANDARD to 20.

---
 build_settings.cmake                          | 7 +++----
 vespamalloc/src/vespamalloc/malloc/overload.h | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build_settings.cmake b/build_settings.cmake
index 597f2cd42ae..63535062c9b 100644
--- a/build_settings.cmake
+++ b/build_settings.cmake
@@ -108,7 +108,7 @@ if (VESPA_USE_SANITIZER)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-sanitize=vptr")
     endif()
 endif()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} ${CXX_SPECIFIC_WARN_OPTS} -std=c++2a -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} ${CXX_SPECIFIC_WARN_OPTS} -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}")
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
 else()
@@ -147,9 +147,8 @@ SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -rdynamic" )
 
 message("-- CMAKE_SHARED_LINKER_FLAGS is ${CMAKE_SHARED_LINKER_FLAGS}")
 
-# Use C++ 17
-# TODO renable when cmake 3.8 is out.
-# set(CMAKE_CXX_STANDARD 17)
+# Use C++ 20
+set(CMAKE_CXX_STANDARD 20)
 
 # Always build shared libs if not explicitly specified
 set(BUILD_SHARED_LIBS ON)
diff --git a/vespamalloc/src/vespamalloc/malloc/overload.h b/vespamalloc/src/vespamalloc/malloc/overload.h
index 725ca761ec1..6583f742751 100644
--- a/vespamalloc/src/vespamalloc/malloc/overload.h
+++ b/vespamalloc/src/vespamalloc/malloc/overload.h
@@ -246,7 +246,7 @@ void* __libc_memalign(size_t align, size_t s)        __THROW __attribute__((leaf
 void* __libc_memalign(size_t align, size_t s)        __THROW __attribute__((leaf, malloc, alloc_size(2))) ALIAS("memalign");
 #endif
 
-int   __posix_memalign(void** r, size_t a, size_t s) __THROW __nonnull((1)) ALIAS("posix_memalign");
+int   __posix_memalign(void** r, size_t a, size_t s) __THROW __nonnull((1)) ALIAS("posix_memalign") __attribute((leaf));
 
 #if __GLIBC_PREREQ(2, 33)
 struct mallinfo2 __libc_mallinfo2()                  __THROW  ALIAS("mallinfo2");
-- 
cgit v1.2.3