Fix gc_allocator.h compilation by Clang

Issue #273 (bdwgc).

Though clang may report __cplusplus as 201402L, it seems to be not
C++11 compliant fully.

* include/gc_allocator.h [!GC_ATTR_EXPLICIT && __clang__ && !CPPCHECK]
(GC_ATTR_EXPLICIT): Define to empty (instead of "explicit").
* tests/test_cpp.cc [!GC_ATTR_EXPLICIT && __clang__ && !CPPCHECK]
(GC_ATTR_EXPLICIT): Likewise.

diff --git a/include/gc_allocator.h b/include/gc_allocator.h
index 491736fadc72ac4b4584e8855ec192654ce748e7..eceb5a429144529e53295391e7b8815f1b15272e 100644 (file)
--- a/include/gc_allocator.h
+++ b/include/gc_allocator.h
@@ -44,7 +44,7 @@
 #include <new> // for placement new and bad_alloc
 
 #ifndef GC_ATTR_EXPLICIT
-# if (__cplusplus >= 201103L) || defined(CPPCHECK)
+# if (__cplusplus >= 201103L) && !defined(__clang__) || defined(CPPCHECK)
 #   define GC_ATTR_EXPLICIT explicit
 # else
 #   define GC_ATTR_EXPLICIT /* empty */

diff --git a/tests/test_cpp.cc b/tests/test_cpp.cc
index 4b24b25efaab6e7fd2c095324d7fed227a77df4b..9b36a3aff468fcb34723e40869719725d2b5a2e3 100644 (file)
--- a/tests/test_cpp.cc
+++ b/tests/test_cpp.cc
@@ -76,7 +76,7 @@ extern "C" {
         exit( 1 ); }
 
 #ifndef GC_ATTR_EXPLICIT
-# if (__cplusplus >= 201103L) || defined(CPPCHECK)
+# if (__cplusplus >= 201103L) && !defined(__clang__) || defined(CPPCHECK)
 #   define GC_ATTR_EXPLICIT explicit
 # else
 #   define GC_ATTR_EXPLICIT /* empty */