From be436e2b0bed33921817ac8c77ea9c44b2abacfe Mon Sep 17 00:00:00 2001 From: omar Date: Wed, 13 Nov 2019 22:04:16 +0100 Subject: [PATCH] Fix HelpMarker() symbol collision for unity builds (#2893) --- imgui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 1706086a..fc89ef4c 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -9639,7 +9639,8 @@ static void ImeSetInputScreenPosFn_DefaultImpl(int, int) {} //----------------------------------------------------------------------------- #ifndef IMGUI_DISABLE_METRICS_WINDOW -static void HelpMarker(const char* desc) +// Avoid naming collision with imgui_demo.cpp's HelpMarker() for unity builds. +static void MetricsHelpMarker(const char* desc) { ImGui::TextDisabled("(?)"); if (ImGui::IsItemHovered()) @@ -9936,7 +9937,7 @@ void ImGui::ShowMetricsWindow(bool* p_open) if (ImGui::Button("Item Picker..")) ImGui::DebugStartItemPicker(); ImGui::SameLine(); - HelpMarker("Will call the IM_DEBUG_BREAK() macro to break in debugger.\nWarning: If you don't have a debugger attached, this will probably crash."); + MetricsHelpMarker("Will call the IM_DEBUG_BREAK() macro to break in debugger.\nWarning: If you don't have a debugger attached, this will probably crash."); ImGui::Checkbox("Show windows begin order", &show_windows_begin_order); ImGui::Checkbox("Show windows rectangles", &show_windows_rects);