mirror of https://github.com/ocornut/imgui
Fixed warning with VS2015 in stb_truetype.h
This commit is contained in:
parent
7d6ddbe5c8
commit
8a3593257f
|
@ -48,6 +48,11 @@ namespace IMGUI_STB_NAMESPACE
|
||||||
{
|
{
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning (push)
|
||||||
|
#pragma warning (disable: 4456) // declaration of 'xx' hides previous local declaration
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __clang__
|
#ifdef __clang__
|
||||||
#pragma clang diagnostic push
|
#pragma clang diagnostic push
|
||||||
#pragma clang diagnostic ignored "-Wunused-function"
|
#pragma clang diagnostic ignored "-Wunused-function"
|
||||||
|
@ -76,6 +81,10 @@ namespace IMGUI_STB_NAMESPACE
|
||||||
#pragma clang diagnostic pop
|
#pragma clang diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning (pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef IMGUI_STB_NAMESPACE
|
#ifdef IMGUI_STB_NAMESPACE
|
||||||
} // namespace ImGuiStb
|
} // namespace ImGuiStb
|
||||||
using namespace IMGUI_STB_NAMESPACE;
|
using namespace IMGUI_STB_NAMESPACE;
|
||||||
|
|
Loading…
Reference in New Issue