diff --git a/CMakeLists.txt b/CMakeLists.txt index efb037bb92..c00378d856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ project( rAthena ) if( CYGWIN ) unset( WIN32 ) endif() -set(CMAKE_CXX_STANDARD 11) # C++11... +set(CMAKE_CXX_STANDARD 14) # C++14... set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required... #set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11 diff --git a/configure b/configure index 0dba23eb87..b1180edf87 100755 --- a/configure +++ b/configure @@ -4538,9 +4538,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CFLAGS="$CFLAGS -pipe -ffast-math -Wall" CPPFLAGS="$CPPFLAGS -I../common" -CXXFLAGS="$CXXFLAGS -std=c++11" -#CXXFLAGS="$CXXFLAGS -std=gnu++11" -CXXFLAG_CLEARS="-std=c++11" +CXXFLAGS="$CXXFLAGS -std=c++14" +#CXXFLAGS="$CXXFLAGS -std=gnu++14" +CXXFLAG_CLEARS="-std=c++14" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } @@ -7109,7 +7109,7 @@ else $as_echo "no" >&6; } fi -CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS" +CXXFLAG_CLEARS="-std=c++14 $CPPFLAGS" CFLAGS="$OPT_LTO $CFLAGS" CFLAGS_AR="$OPT_LTO_AR $CFLAGS" diff --git a/configure.ac b/configure.ac index bc8fd62b85..af73183072 100644 --- a/configure.ac +++ b/configure.ac @@ -483,9 +483,9 @@ AC_LANG([C++]) CFLAGS="$CFLAGS -pipe -ffast-math -Wall" CPPFLAGS="$CPPFLAGS -I../common" -CXXFLAGS="$CXXFLAGS -std=c++11" -#CXXFLAGS="$CXXFLAGS -std=gnu++11" -CXXFLAG_CLEARS="-std=c++11" +CXXFLAGS="$CXXFLAGS -std=c++14" +#CXXFLAGS="$CXXFLAGS -std=gnu++14" +CXXFLAG_CLEARS="-std=c++14" AC_C_BIGENDIAN( [AC_MSG_ERROR([[bigendian is not supported... stopping]])], @@ -1355,7 +1355,7 @@ else AC_MSG_RESULT([no]) fi -CXXFLAG_CLEARS="-std=c++11 $CPPFLAGS" +CXXFLAG_CLEARS="-std=c++14 $CPPFLAGS" CFLAGS="$OPT_LTO $CFLAGS" CFLAGS_AR="$OPT_LTO_AR $CFLAGS" AC_SUBST([CFLAGS_AR])