Michele Caini пре 2 година
родитељ
комит
e04f2bdb24

+ 2 - 2
src/entt/meta/context.hpp

@@ -21,8 +21,8 @@ struct meta_type_node;
 struct meta_context {
 struct meta_context {
     dense_map<id_type, meta_type_node, identity> value{};
     dense_map<id_type, meta_type_node, identity> value{};
 
 
-    [[nodiscard]] static inline meta_context &from(meta_ctx &ctx);
-    [[nodiscard]] static inline const meta_context &from(const meta_ctx &ctx);
+    [[nodiscard]] inline static meta_context &from(meta_ctx &ctx);
+    [[nodiscard]] inline static const meta_context &from(const meta_ctx &ctx);
 };
 };
 
 
 } // namespace internal
 } // namespace internal

+ 1 - 1
test/entt/meta/meta_any.cpp

@@ -26,7 +26,7 @@ struct clazz_t {
         return value;
         return value;
     }
     }
 
 
-    static inline char c = 'c';
+    inline static char c = 'c';
     int value;
     int value;
 };
 };
 
 

+ 1 - 1
test/entt/meta/meta_data.cpp

@@ -93,7 +93,7 @@ struct multi_setter_t {
 };
 };
 
 
 struct array_t {
 struct array_t {
-    static inline int global[3];
+    inline static int global[3];
     int local[5];
     int local[5];
 };
 };
 
 

+ 2 - 2
test/entt/process/scheduler.cpp

@@ -27,7 +27,7 @@ struct succeeded_process: entt::process<succeeded_process, entt::scheduler::delt
         succeed();
         succeed();
     }
     }
 
 
-    static inline unsigned int invoked;
+    inline static unsigned int invoked;
 };
 };
 
 
 struct failed_process: entt::process<failed_process, entt::scheduler::delta_type> {
 struct failed_process: entt::process<failed_process, entt::scheduler::delta_type> {
@@ -36,7 +36,7 @@ struct failed_process: entt::process<failed_process, entt::scheduler::delta_type
         fail();
         fail();
     }
     }
 
 
-    static inline unsigned int invoked;
+    inline static unsigned int invoked;
 };
 };
 
 
 struct Scheduler: ::testing::Test {
 struct Scheduler: ::testing::Test {