From 41a32267cd0f96978b301cda01cab2fd35a930d7 Mon Sep 17 00:00:00 2001
From: Nick Drabsch <zero@hypixelstudios.com>
Date: Thu, 3 Aug 2023 00:34:18 +0100
Subject: [PATCH] Move world::get_info out of pipeline mixin

---
 flecs.h                                          | 16 +++++++---------
 .../flecs/addons/cpp/mixins/pipeline/impl.hpp    |  4 ----
 .../flecs/addons/cpp/mixins/pipeline/mixin.inl   |  5 -----
 include/flecs/addons/cpp/world.hpp               |  7 +++++++
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/flecs.h b/flecs.h
index 6509eac5b..cb677afab 100644
--- a/flecs.h
+++ b/flecs.h
@@ -19827,6 +19827,13 @@ struct world {
         ecs_run_post_frame(m_world, action, ctx);
     }
 
+    /** Get the world info.
+     * @see ecs_get_world_info
+     */
+    const flecs::world_info_t* get_info() const{
+        return ecs_get_world_info(m_world);
+    }
+
 /**
  * @file addons/cpp/mixins/id/mixin.inl
  * @brief Id world mixin.
@@ -20217,11 +20224,6 @@ void run_pipeline(const flecs::entity_t pip, ecs_ftime_t delta_time = 0.0) const
 template <typename Pipeline, if_not_t< is_enum<Pipeline>::value > = 0>
 void run_pipeline(ecs_ftime_t delta_time = 0.0) const;
 
-/** Get the world info.
- * @see ecs_get_world_info
- */
-const flecs::world_info_t* get_info() const;
-
 /** Set timescale.
  * @see ecs_set_time_scale
  */
@@ -28452,10 +28454,6 @@ inline void world::run_pipeline(ecs_ftime_t delta_time) const {
     return ecs_run_pipeline(m_world, _::cpp_type<Pipeline>::id(m_world), delta_time);
 }
 
-const flecs::world_info_t* world::get_info() const {
-    return ecs_get_world_info(m_world);
-}
-
 inline void world::set_time_scale(ecs_ftime_t mul) const {
     ecs_set_time_scale(m_world, mul);
 }
diff --git a/include/flecs/addons/cpp/mixins/pipeline/impl.hpp b/include/flecs/addons/cpp/mixins/pipeline/impl.hpp
index 25248488c..f9595d7b6 100644
--- a/include/flecs/addons/cpp/mixins/pipeline/impl.hpp
+++ b/include/flecs/addons/cpp/mixins/pipeline/impl.hpp
@@ -61,10 +61,6 @@ inline void world::run_pipeline(ecs_ftime_t delta_time) const {
     return ecs_run_pipeline(m_world, _::cpp_type<Pipeline>::id(m_world), delta_time);
 }
 
-const flecs::world_info_t* world::get_info() const {
-    return ecs_get_world_info(m_world);
-}
-
 inline void world::set_time_scale(ecs_ftime_t mul) const {
     ecs_set_time_scale(m_world, mul);
 }
diff --git a/include/flecs/addons/cpp/mixins/pipeline/mixin.inl b/include/flecs/addons/cpp/mixins/pipeline/mixin.inl
index d3e7883e1..d41945922 100644
--- a/include/flecs/addons/cpp/mixins/pipeline/mixin.inl
+++ b/include/flecs/addons/cpp/mixins/pipeline/mixin.inl
@@ -55,11 +55,6 @@ void run_pipeline(const flecs::entity_t pip, ecs_ftime_t delta_time = 0.0) const
 template <typename Pipeline, if_not_t< is_enum<Pipeline>::value > = 0>
 void run_pipeline(ecs_ftime_t delta_time = 0.0) const;
 
-/** Get the world info.
- * @see ecs_get_world_info
- */
-const flecs::world_info_t* get_info() const;
-
 /** Set timescale.
  * @see ecs_set_time_scale
  */
diff --git a/include/flecs/addons/cpp/world.hpp b/include/flecs/addons/cpp/world.hpp
index 33af2862a..4a277c398 100644
--- a/include/flecs/addons/cpp/world.hpp
+++ b/include/flecs/addons/cpp/world.hpp
@@ -987,6 +987,13 @@ struct world {
         ecs_run_post_frame(m_world, action, ctx);
     }
 
+    /** Get the world info.
+     * @see ecs_get_world_info
+     */
+    const flecs::world_info_t* get_info() const{
+        return ecs_get_world_info(m_world);
+    }
+
 #   include "mixins/id/mixin.inl"
 #   include "mixins/component/mixin.inl"
 #   include "mixins/entity/mixin.inl"