From 2cb9032d76e2a6751b2b2a9458c6823e23fa1e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 15 Feb 2014 16:19:50 +0100 Subject: [PATCH] cxx11.h: removed the 'evil workaround' --- lib/cxx11emu.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/cxx11emu.h b/lib/cxx11emu.h index e4da63bf5..01779ca71 100644 --- a/lib/cxx11emu.h +++ b/lib/cxx11emu.h @@ -43,12 +43,7 @@ public: } private: void operator&() const; // whose address can't be taken -} 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 +} nullptr = {}; // and whose name is nullptr // Static assertions