From 8f90238e53465cee199e6f874bd48de4adfe96be Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 21 Mar 2015 10:03:03 +0000 Subject: [PATCH 1/3] Fixed IMGUI_DISABLE_TEST_WINDOWS #169 Fixed warning --- imgui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index fcd87e4c..9474a78d 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -8822,8 +8822,8 @@ static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y) #ifdef IMGUI_DISABLE_TEST_WINDOWS void ImGui::ShowUserGuide() {} -void ImGui::ShowStyleEditor() {} -void ImGui::ShowTestWindow() {} +void ImGui::ShowStyleEditor(ImGuiStyle*) {} +void ImGui::ShowTestWindow(bool*) {} #else From bae32567c339e3c45d86cd675366c45cdce1cb4a Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 21 Mar 2015 10:04:10 +0000 Subject: [PATCH 2/3] Fixed unused parameter warning with empty IME handler #173 --- imgui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imgui.cpp b/imgui.cpp index 9474a78d..b0953da5 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -8813,7 +8813,7 @@ static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y) #else -static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y) +static void ImeSetInputScreenPosFn_DefaultImpl(int, int) { } From 7f49ac04072b03c8e078cf5e1cc1ce4430b3705c Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 21 Mar 2015 10:14:10 +0000 Subject: [PATCH 3/3] Disabled -Wmissing-noreturn warning for Clang a bit reluctantly - will put back when removing GetDefaultFontData() #173 --- imgui.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/imgui.cpp b/imgui.cpp index b0953da5..e90dc2e9 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -358,6 +358,7 @@ #pragma clang diagnostic ignored "-Wexit-time-destructors" // warning : declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals. #pragma clang diagnostic ignored "-Wglobal-constructors" // warning : declaration requires a global destructor // similar to above, not sure what the exact difference it. #pragma clang diagnostic ignored "-Wsign-conversion" // warning : implicit conversion changes signedness // +#pragma clang diagnostic ignored "-Wmissing-noreturn" // warning : function xx could be declared with attribute 'noreturn' warning // GetDefaultFontData() asserts which some implementation makes it never return. #endif #ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used