Editor: Don't duplicated ImVec2/ImVec3 == != operators defined since …

…ImGui r19002 (#268)
thedmd · Dec 27, 2023 · 3ed93be · 3ed93be
1 parent 383099c
commit 3ed93be
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -2,6 +2,8 @@ v0.9.4 (WIP):
 
     BUGFIX: Canvas: Remember index of first command buffer to not miss updating any used (#260)
 
+    BUGFIX: Editor: Don't duplicated ImVec2/ImVec3 == != operators defined since ImGui r19002 (#268)
+
 v0.9.3 (2023-10-14):
 
     CHANGE: Canvas: Use ImDrawCallback_ImCanvas macro as draw callback sentinel (#256), thanks @nspitko

diff --git a/imgui_extra_math.h b/imgui_extra_math.h
@@ -30,8 +30,10 @@ struct ImLine
 
 
 //------------------------------------------------------------------------------
+# if IMGUI_VERSION_NUM < 19002
 inline bool operator==(const ImVec2& lhs, const ImVec2& rhs);
 inline bool operator!=(const ImVec2& lhs, const ImVec2& rhs);
+# endif
 inline ImVec2 operator*(const float lhs, const ImVec2& rhs);
 # if IMGUI_VERSION_NUM < 18955
 inline ImVec2 operator-(const ImVec2& lhs);

diff --git a/imgui_extra_math.inl b/imgui_extra_math.inl
@@ -19,6 +19,7 @@
 
 
 //------------------------------------------------------------------------------
+# if IMGUI_VERSION_NUM < 19002
 inline bool operator==(const ImVec2& lhs, const ImVec2& rhs)
 {
     return lhs.x == rhs.x && lhs.y == rhs.y;
@@ -28,6 +29,7 @@ inline bool operator!=(const ImVec2& lhs, const ImVec2& rhs)
 {
     return lhs.x != rhs.x || lhs.y != rhs.y;
 }
+# endif
 
 inline ImVec2 operator*(const float lhs, const ImVec2& rhs)
 {