From 8a3593257f3c1ed4488d7520ee7edf14e0705be0 Mon Sep 17 00:00:00 2001 From: ocornut Date: Mon, 7 Sep 2015 15:51:43 +0100 Subject: [PATCH] Fixed warning with VS2015 in stb_truetype.h --- imgui_draw.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/imgui_draw.cpp b/imgui_draw.cpp index 54eda29a4..e7b4fe04f 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -48,6 +48,11 @@ namespace IMGUI_STB_NAMESPACE { #endif +#ifdef _MSC_VER +#pragma warning (push) +#pragma warning (disable: 4456) // declaration of 'xx' hides previous local declaration +#endif + #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-function" @@ -76,6 +81,10 @@ namespace IMGUI_STB_NAMESPACE #pragma clang diagnostic pop #endif +#ifdef _MSC_VER +#pragma warning (pop) +#endif + #ifdef IMGUI_STB_NAMESPACE } // namespace ImGuiStb using namespace IMGUI_STB_NAMESPACE;