From ca0df72b9c3d25c04ef26836f9413a1d5169fd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 21 Oct 2013 13:55:03 +0000 Subject: [PATCH] __cplusplus==1 has no C++11 on Mac; refs #7 --- configure.in | 1 - src/mrw/checkcxx11.hxx | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index ebcb5e5..418bc09 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,4 @@ # $Id$ -set +x m4_include(ax_cxx_compile_stdcxx_11.m4) AC_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR]) AC_DEFUN([AX_DEFINE_DIR], [ diff --git a/src/mrw/checkcxx11.hxx b/src/mrw/checkcxx11.hxx index 823aa08..2cbaa70 100644 --- a/src/mrw/checkcxx11.hxx +++ b/src/mrw/checkcxx11.hxx @@ -27,14 +27,14 @@ # endif # if __cplusplus==1 +// __cplusplus==1 is a known bug in gcc 4.6.3 # warning your compiler has a know bug, please upgrade to gcc >= 4.7 # warning see __cplusplus in http://gcc.gnu.org/gcc-4.7/changes.html # endif # ifdef MRW__OLD_PRE11_COMPILER -// __cplusplus==1 is a known bug in gcc 4.6.3 -# if __cplusplus<200300L && __cplusplus!=1 +# if __cplusplus<200300L # include namespace std { // there is no std::shared_ptr in pre C++11 compilers, so we use the