diff options
| author | Alexey Sokolov <sokolov@google.com> | 2014-02-07 11:32:50 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-02-07 11:34:07 +0100 |
| commit | 3cb291504324193c137d45b7b8f7ea1382325153 (patch) | |
| tree | 1856400b8a833983a8be44ee899e869404b78edc /m4/ax_cxx_compile_stdcxx_11.m4 | |
| parent | 3e8e0d65b840c2bc4fa9a79a3774f8e1ac2b51b0 (diff) | |
| download | autoconf-archive-3cb291504324193c137d45b7b8f7ea1382325153.tar.gz | |
AX_CXX_COMPILE_STDCXX_11: fix "mandatory" option and add more C++11 feature tests
See <https://savannah.gnu.org/patch/index.php?8287> for further details.
Diffstat (limited to 'm4/ax_cxx_compile_stdcxx_11.m4')
| -rw-r--r-- | m4/ax_cxx_compile_stdcxx_11.m4 | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 index af37acd..163a4c6 100644 --- a/m4/ax_cxx_compile_stdcxx_11.m4 +++ b/m4/ax_cxx_compile_stdcxx_11.m4 @@ -27,21 +27,29 @@ # Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> # Copyright (c) 2012 Zack Weinberg <zackw@panix.com> # Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu> +# Copyright (c) 2014 Alexey Sokolov <sokolov@google.com> # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 3 +#serial 4 -m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ +m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ template <typename T> struct check { static_assert(sizeof(int) <= sizeof(T), "not big enough"); }; + struct Base { + virtual void f() {} + }; + struct Child : public Base { + virtual void f() override {} + }; + typedef check<check<bool>> right_angle_brackets; int a; @@ -52,7 +60,8 @@ m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ check_type&& cr = static_cast<check_type&&>(c); auto d = a; -]) + auto l = [](){}; +]]) AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl m4_if([$1], [], [], @@ -62,7 +71,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], [$2], [optional], [ax_cxx_compile_cxx11_required=false], - [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])]) AC_LANG_PUSH([C++])dnl ac_success=no AC_CACHE_CHECK(whether $CXX supports C++11 features by default, |