From d509cf2fb507aa243286f0aac98ac776fdc2163b Mon Sep 17 00:00:00 2001 From: Michael Casadevall Date: Tue, 28 Jun 2016 09:39:46 -0500 Subject: [PATCH] It helps when you pop pragmas Signed-off-by: Michael Casadevall --- library/include/Error.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/include/Error.h b/library/include/Error.h index 4e3224f49..1c8afe44c 100644 --- a/library/include/Error.h +++ b/library/include/Error.h @@ -48,7 +48,10 @@ namespace DFHack * care since we build all of DFhack at once against whatever Toady is using */ #pragma warning(disable: 4275) +#endif class DFHACK_EXPORT All : public std::exception{}; +#ifdef _MSC_VER +#pragma pop #endif class DFHACK_EXPORT NullPointer : public All { const char *varname_;