Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 12:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on <new> header (#484, #504)

Browse Source 
(Now expecting something to fail somewhere..)
This commit is contained in:
ocornut
2016-01-25 21:26:53 +00:00
parent 3ee50af57e
commit 595684e08c
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
imgui_draw.cpp
View File

@ -14,10 +14,10 @@
#include "imgui.h"
#define IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_PLACEMENT_NEW
#include "imgui_internal.h"
#include <stdio.h> // vsnprintf, sscanf, printf
#include <new> // new (ptr)
#if !defined(alloca) && !defined(__FreeBSD__)
#ifdef _WIN32
#include <malloc.h> // alloca
@ -266,7 +266,7 @@ void ImDrawList::ChannelsSplit(int channels_count)
{
if (i >= old_channels_count)
{
new(&_Channels[i]) ImDrawChannel();
IM_PLACEMENT_NEW(&_Channels[i]) ImDrawChannel();
}
else
{
@ -1097,7 +1097,7 @@ ImFont* ImFontAtlas::AddFont(const ImFontConfig* font_cfg)
if (!font_cfg->MergeMode)
{
ImFont* font = (ImFont*)ImGui::MemAlloc(sizeof(ImFont));
new (font) ImFont();
IM_PLACEMENT_NEW(font) ImFont();
Fonts.push_back(font);
}