2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 04:57:52 +00:00

[#2876] Changed to C++ 14

This commit is contained in:
Francis Dupont 2023-07-16 14:40:03 +02:00
parent a21effda55
commit 743f0fbf27
4 changed files with 12 additions and 12 deletions

View File

@ -158,8 +158,8 @@ AC_CHECK_DECL([__clang__], [CLANGPP="yes"], [CLANGPP="no"])
# USE_CLANGPP is no longer used, keep it by symmetry with USE_GXX? # USE_CLANGPP is no longer used, keep it by symmetry with USE_GXX?
AM_CONDITIONAL(USE_CLANGPP, test "X${CLANGPP}" = "Xyes") AM_CONDITIONAL(USE_CLANGPP, test "X${CLANGPP}" = "Xyes")
# Check for C++11 features support # Check for C++14 features support
AX_ISC_CPP11 AX_ISC_CPP14
# Check for C++20 compiler support. # Check for C++20 compiler support.
AX_ISC_CPP20 AX_ISC_CPP20
@ -614,7 +614,7 @@ AC_COMPILE_IFELSE(
) )
usable_regex= usable_regex=
AC_MSG_CHECKING(for usable C++11 regex) AC_MSG_CHECKING(for usable C++14 regex)
AC_RUN_IFELSE([AC_LANG_SOURCE([[ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <regex> #include <regex>
#include <iostream> #include <iostream>
@ -633,7 +633,7 @@ int main() {
# usable or not. # usable or not.
# Let's be optimistic and assume it is by testing only the negative case. # Let's be optimistic and assume it is by testing only the negative case.
if test "x$usable_regex" != "xno" ; then if test "x$usable_regex" != "xno" ; then
AC_DEFINE(USE_REGEX, 1, [Define to 1 if C++11 regex is usable]) AC_DEFINE(USE_REGEX, 1, [Define to 1 if C++14 regex is usable])
fi fi
# Check for NETCONF support. If NETCONF was enabled in the build, and this check # Check for NETCONF support. If NETCONF was enabled in the build, and this check
@ -971,7 +971,7 @@ AC_CHECK_LIB(pthread, pthread_create,[ LDFLAGS="$LDFLAGS -lpthread" ], [])
AX_TLS AX_TLS
# #
# Some Googletest versions bug with C++11 compilers # Some Googletest versions bug with C++14 compilers
# #
if test $enable_gtest != "no"; then if test $enable_gtest != "no"; then
AC_MSG_CHECKING([if Google Test is compatible with the compiler]) AC_MSG_CHECKING([if Google Test is compatible with the compiler])

View File

@ -153,7 +153,7 @@ the system:
- log4cplus (at least version 1.0.3) development include headers. - log4cplus (at least version 1.0.3) development include headers.
- A C++ compiler (with C++11 support) and standard development headers. - A C++ compiler (with C++14 support) and standard development headers.
The Kea build has been checked with GCC g++ 4.8.5 and some later versions, The Kea build has been checked with GCC g++ 4.8.5 and some later versions,
and Clang 800.0.38 and some later versions. and Clang 800.0.38 and some later versions.

View File

@ -1,13 +1,13 @@
AC_DEFUN([AX_ISC_CPP11], [ AC_DEFUN([AX_ISC_CPP14], [
CXX_SAVED=$CXX CXX_SAVED=$CXX
feature= feature=
for retry in "none" "--std=c++11" "--std=c++0x" "--std=c++1x" "fail"; do for retry in "none" "--std=c++14" "--std=c++0x" "--std=c++1x" "fail"; do
if test "$retry" = "fail"; then if test "$retry" = "fail"; then
AC_MSG_ERROR([$feature (a C++11 feature) is not supported]) AC_MSG_ERROR([$feature (a C++14 feature) is not supported])
fi fi
if test "$retry" != "none"; then if test "$retry" != "none"; then
AC_MSG_WARN([unsupported C++11 feature]) AC_MSG_WARN([unsupported C++14 feature])
AC_MSG_NOTICE([retrying by adding $retry to $CXX]) AC_MSG_NOTICE([retrying by adding $retry to $CXX])
CXX="$CXX_SAVED $retry" CXX="$CXX_SAVED $retry"
AC_MSG_CHECKING($retry support) AC_MSG_CHECKING($retry support)
@ -238,4 +238,4 @@ for retry in "none" "--std=c++11" "--std=c++0x" "--std=c++1x" "fail"; do
break break
done done
])dnl AX_ISC_CPP11 ])dnl AX_ISC_CPP14

View File

@ -4,7 +4,7 @@ Supported Platforms
=================== ===================
In general, this version of Kea builds and runs on any POSIX-compliant In general, this version of Kea builds and runs on any POSIX-compliant
system with a C++ compiler (with C++11 support), the Botan cryptographic library, system with a C++ compiler (with C++14 support), the Botan cryptographic library,
the log4cplus logging library and the Boost system library. the log4cplus logging library and the Boost system library.
The Kea build has been checked with GCC g++ 4.8.5 and some later versions, The Kea build has been checked with GCC g++ 4.8.5 and some later versions,