From 7afd62ec578258750ac7a09ab96ce1d8bfe6e2cd Mon Sep 17 00:00:00 2001 From: ocornut Date: Mon, 25 Jan 2016 21:45:45 +0000 Subject: [PATCH] Tentative fix for GCC/Clang (#484, #504) --- imgui_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imgui_internal.h b/imgui_internal.h index 0ffb5c5fc..c8748ada1 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -141,8 +141,8 @@ static inline ImVec2 ImRound(ImVec2 v) // Defining a custom placement new() with a dummy parameter allows us to bypass including which on some platforms complains when user has disabled exceptions. #ifdef IMGUI_DEFINE_PLACEMENT_NEW struct ImPlacementNewDummy {}; -static inline void* operator new(size_t, ImPlacementNewDummy, void* ptr) { return ptr; } -static inline void operator delete(void*, ImPlacementNewDummy, void*) {} +inline void* operator new(size_t, ImPlacementNewDummy, void* ptr) { return ptr; } +inline void operator delete(void*, ImPlacementNewDummy, void*) {} #define IM_PLACEMENT_NEW(_PTR) new(ImPlacementNewDummy() ,_PTR) #endif