Tentative fix for GCC/Clang (#484, #504)

This commit is contained in:
ocornut 2016-01-25 21:45:45 +00:00
parent 595684e08c
commit 7afd62ec57

View File

@ -141,8 +141,8 @@ static inline ImVec2 ImRound(ImVec2 v)
// Defining a custom placement new() with a dummy parameter allows us to bypass including <new> which on some platforms complains when user has disabled exceptions. // Defining a custom placement new() with a dummy parameter allows us to bypass including <new> which on some platforms complains when user has disabled exceptions.
#ifdef IMGUI_DEFINE_PLACEMENT_NEW #ifdef IMGUI_DEFINE_PLACEMENT_NEW
struct ImPlacementNewDummy {}; struct ImPlacementNewDummy {};
static inline void* operator new(size_t, ImPlacementNewDummy, void* ptr) { return ptr; } inline void* operator new(size_t, ImPlacementNewDummy, void* ptr) { return ptr; }
static inline void operator delete(void*, ImPlacementNewDummy, void*) {} inline void operator delete(void*, ImPlacementNewDummy, void*) {}
#define IM_PLACEMENT_NEW(_PTR) new(ImPlacementNewDummy() ,_PTR) #define IM_PLACEMENT_NEW(_PTR) new(ImPlacementNewDummy() ,_PTR)
#endif #endif