From fa42f554a8d4b9babb21b4b80d4da24c01b176cb Mon Sep 17 00:00:00 2001
From: Alexander Mai <amai@users.sf.net>
Date: Fri, 1 May 2015 16:25:27 +0200
Subject: [PATCH] cppcheck compilation fails with g++4.6.3 (#5929). Patch
 supplied by mavik1

---
 lib/cxx11emu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cxx11emu.h b/lib/cxx11emu.h
index 08b825710..dd3af0c40 100644
--- a/lib/cxx11emu.h
+++ b/lib/cxx11emu.h
@@ -24,7 +24,7 @@
 /* Emulate certain features of C++11 in a C++98-compatible way. */
 
 #ifdef __cplusplus
-#if (__GNUC__ <= 4 && __GNUC_MINOR__ < 6 && !defined(__clang__)) || __cplusplus < 201103L
+#if (__GNUC__ <= 4 && __GNUC_MINOR__ < 6 && !defined(__clang__)) || (!defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L)
 
 // Null pointer literal
 // Source: SC22/WG21/N2431 = J16/07-0301