From 9a59e0374415bae2fa3e092ec024355bc490f70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 9 Sep 2014 09:08:04 +0000 Subject: [PATCH] give it a try: remove specal Apple handling for detecting C++11; refs #11 --- src/mrw/checkcxx11.hxx | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/mrw/checkcxx11.hxx b/src/mrw/checkcxx11.hxx index defaa28..d98c03a 100644 --- a/src/mrw/checkcxx11.hxx +++ b/src/mrw/checkcxx11.hxx @@ -12,19 +12,18 @@ // otherwise there is a fallback wich makes everything much more compliacted # ifndef MRW__OLD_PRE11_COMPILER # if __cplusplus < 201103L -# if __APPLE__ - /// Code is compiled with an old non C++11 standard compliant compiler - /** There are workarounds for old non C++11 compatible - compilers. These workarounds are deprecated, but will remain until - most compilers fully support C++11. So this workaround will be - removed in future releases, when support for C++11 is more - common. Only rely on this workaround, if you really have to. */ -# define MRW__OLD_PRE11_COMPILER -# warning you need a C++11 compliant compiler, on gcc: add -std=c++11 -# warning emulating C++11 - this changes the way you use the library -# warning this is deprecated and will be removed in future releases -# warning refere to the library documentation for more details -# elif __cplusplus==1 +// # if __APPLE__ +// /// Code is compiled with an old non C++11 standard compliant compiler +// /** There are workarounds for old non C++11 compatible +// compilers. These workarounds are deprecated, but will remain until +// most compilers fully support C++11. So this workaround will be +// removed in future releases, when support for C++11 is more +// common. Only rely on this workaround, if you really have to. */ +// # warning you need a C++11 compliant compiler, on gcc: add -std=c++11 +// # warning to emulate C++11, on gcc: add -DMRW__OLD_PRE11_COMPILER +// # warning refere to the library documentation for more details +// # elif __cplusplus==1 +# 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