From e9ceef4762a801737ead8f4d3d492f4f8c153306 Mon Sep 17 00:00:00 2001 From: omar Date: Sat, 23 Dec 2017 20:37:36 +0100 Subject: [PATCH] ImVector: Revert 6172e932728a0fa629d910c1a1534d66a59e386a actually problematic with our current use (because we don't construct the instances). --- imgui.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/imgui.h b/imgui.h index de9177c9..33580dc2 100644 --- a/imgui.h +++ b/imgui.h @@ -1018,10 +1018,8 @@ public: typedef value_type* iterator; typedef const value_type* const_iterator; - inline ImVector() { Size = Capacity = 0; Data = NULL; } - inline ~ImVector() { if (Data) ImGui::MemFree(Data); } - inline ImVector(const ImVector& rhs) { Size = Capacity = 0; Data = NULL; if (rhs.Size) { resize(rhs.Size); memcpy(Data, rhs.Data, (size_t)rhs.Size * sizeof(T)); } } - inline ImVector& operator=(const ImVector& rhs) { resize(rhs.Size); if (rhs.Size) memcpy(Data, rhs.Data, (size_t)rhs.Size * sizeof(T)); return *this; } + inline ImVector() { Size = Capacity = 0; Data = NULL; } + inline ~ImVector() { if (Data) ImGui::MemFree(Data); } inline bool empty() const { return Size == 0; } inline int size() const { return Size; }