From 910a90e4c1e90f37a3e46edc4d991eeb09b524f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Fri, 21 Feb 2014 20:06:55 +0100 Subject: [PATCH] Revert "cxx11.h: removed the 'evil workaround'" This reverts commit 2cb9032d76e2a6751b2b2a9458c6823e23fa1e21. --- lib/cxx11emu.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/cxx11emu.h b/lib/cxx11emu.h index 01779ca71..e4da63bf5 100644 --- a/lib/cxx11emu.h +++ b/lib/cxx11emu.h @@ -43,7 +43,12 @@ public: } private: void operator&() const; // whose address can't be taken -} nullptr = {}; // and whose name is nullptr +} cppcheck_nullptr_impl = {}; // and whose name is nullptr + +// An evil workaround for the inability to disable -Wc++0x-compat using a #pragma. +// Once -std=c++0x is embraced, the above class can be renamed to nullptr and +// the define can be removed. +#define nullptr cppcheck_nullptr_impl // Static assertions