Bläddra i källkod

core: move inline ctors to string_id.inl

Daniele Bartolini 2 år sedan
förälder
incheckning
7d61e2d07b

+ 15 - 16
src/core/strings/string_id.h

@@ -19,19 +19,19 @@ struct StringId32
 {
 {
 	u32 _id;
 	u32 _id;
 
 
-	StringId32()
-		: _id(0)
-	{
-	}
+	///
+	StringId32();
 
 
-	explicit StringId32(u32 idx)
-		: _id(idx)
-	{
-	}
+	///
+	explicit StringId32(u32 idx);
 
 
+	///
 	explicit StringId32(const char *str);
 	explicit StringId32(const char *str);
+
+	///
 	StringId32(const char *str, u32 len);
 	StringId32(const char *str, u32 len);
 
 
+	///
 	void hash(const char *str, u32 len);
 	void hash(const char *str, u32 len);
 
 
 	/// Parses the id from @a str.
 	/// Parses the id from @a str.
@@ -50,17 +50,16 @@ struct StringId64
 {
 {
 	u64 _id;
 	u64 _id;
 
 
-	StringId64()
-		: _id(0)
-	{
-	}
+	///
+	StringId64();
 
 
-	explicit StringId64(u64 idx)
-		: _id(idx)
-	{
-	}
+	///
+	explicit StringId64(u64 idx);
 
 
+	///
 	explicit StringId64(const char *str);
 	explicit StringId64(const char *str);
+
+	///
 	StringId64(const char *str, u32 len);
 	StringId64(const char *str, u32 len);
 
 
 	void hash(const char *str, u32 len);
 	void hash(const char *str, u32 len);

+ 20 - 0
src/core/strings/string_id.inl

@@ -14,6 +14,16 @@ namespace crown
 {
 {
 /// @addtogroup String
 /// @addtogroup String
 /// @{
 /// @{
+inline StringId32::StringId32()
+	: _id(0)
+{
+}
+
+inline StringId32::StringId32(u32 idx)
+	: _id(idx)
+{
+}
+
 inline bool operator==(const StringId32 &a, const StringId32 &b)
 inline bool operator==(const StringId32 &a, const StringId32 &b)
 {
 {
 	return a._id == b._id;
 	return a._id == b._id;
@@ -34,6 +44,16 @@ inline bool operator<(const StringId32 &a, const StringId32 &b)
 	return a._id < b._id;
 	return a._id < b._id;
 }
 }
 
 
+inline StringId64::StringId64()
+	: _id(0)
+{
+}
+
+inline StringId64::StringId64(u64 idx)
+	: _id(idx)
+{
+}
+
 inline bool operator==(const StringId64 &a, const StringId64 &b)
 inline bool operator==(const StringId64 &a, const StringId64 &b)
 {
 {
 	return a._id == b._id;
 	return a._id == b._id;

+ 1 - 0
src/device/boot_config.cpp

@@ -9,6 +9,7 @@
 #include "core/memory/temp_allocator.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/platform.h"
 #include "core/platform.h"
 #include "core/strings/dynamic_string.inl"
 #include "core/strings/dynamic_string.inl"
+#include "core/strings/string_id.inl"
 #include "device/boot_config.h"
 #include "device/boot_config.h"
 
 
 namespace crown
 namespace crown

+ 1 - 0
src/device/pipeline.cpp

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: MIT
  * SPDX-License-Identifier: MIT
  */
  */
 
 
+#include "core/strings/string_id.inl"
 #include "core/types.h"
 #include "core/types.h"
 #include "device/pipeline.h"
 #include "device/pipeline.h"
 #include "world/shader_manager.h"
 #include "world/shader_manager.h"

+ 1 - 0
src/lua/lua_api.cpp

@@ -18,6 +18,7 @@
 #include "core/math/vector3.inl"
 #include "core/math/vector3.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/strings/dynamic_string.inl"
 #include "core/strings/dynamic_string.inl"
+#include "core/strings/string_id.inl"
 #include "core/strings/string_stream.inl"
 #include "core/strings/string_stream.inl"
 #include "device/console_server.h"
 #include "device/console_server.h"
 #include "device/device.h"
 #include "device/device.h"

+ 1 - 0
src/lua/lua_environment.cpp

@@ -9,6 +9,7 @@
 #include "core/json/sjson.h"
 #include "core/json/sjson.h"
 #include "core/memory/temp_allocator.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/strings/dynamic_string.inl"
 #include "core/strings/dynamic_string.inl"
+#include "core/strings/string_id.inl"
 #include "core/strings/string_stream.inl"
 #include "core/strings/string_stream.inl"
 #include "device/device.h"
 #include "device/device.h"
 #include "device/log.h"
 #include "device/log.h"

+ 1 - 0
src/resource/level_resource.cpp

@@ -11,6 +11,7 @@
 #include "core/memory/globals.h"
 #include "core/memory/globals.h"
 #include "core/memory/temp_allocator.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/strings/dynamic_string.inl"
 #include "core/strings/dynamic_string.inl"
+#include "core/strings/string_id.inl"
 #include "resource/compile_options.inl"
 #include "resource/compile_options.inl"
 #include "resource/level_resource.h"
 #include "resource/level_resource.h"
 #include "resource/unit_compiler.h"
 #include "resource/unit_compiler.h"

+ 1 - 0
src/resource/resource_id.cpp

@@ -7,6 +7,7 @@
 #include "core/filesystem/path.h"
 #include "core/filesystem/path.h"
 #include "core/memory/temp_allocator.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/strings/dynamic_string.inl"
 #include "core/strings/dynamic_string.inl"
+#include "core/strings/string_id.inl"
 #include "resource/resource_id.inl"
 #include "resource/resource_id.inl"
 
 
 namespace crown
 namespace crown

+ 1 - 0
src/resource/resource_package.cpp

@@ -4,6 +4,7 @@
  */
  */
 
 
 #include "core/containers/array.inl"
 #include "core/containers/array.inl"
+#include "core/strings/string_id.inl"
 #include "resource/package_resource.h"
 #include "resource/package_resource.h"
 #include "resource/resource_id.inl"
 #include "resource/resource_id.inl"
 #include "resource/resource_manager.h"
 #include "resource/resource_manager.h"

+ 1 - 0
src/resource/sprite_resource.cpp

@@ -14,6 +14,7 @@
 #include "core/math/vector4.inl"
 #include "core/math/vector4.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/strings/string.inl"
 #include "core/strings/string.inl"
+#include "core/strings/string_id.inl"
 #include "resource/compile_options.inl"
 #include "resource/compile_options.inl"
 #include "resource/resource_manager.h"
 #include "resource/resource_manager.h"
 #include "resource/sprite_resource.h"
 #include "resource/sprite_resource.h"

+ 1 - 0
src/resource/texture_resource.cpp

@@ -10,6 +10,7 @@
 #include "core/memory/temp_allocator.inl"
 #include "core/memory/temp_allocator.inl"
 #include "core/process.h"
 #include "core/process.h"
 #include "core/strings/dynamic_string.inl"
 #include "core/strings/dynamic_string.inl"
+#include "core/strings/string_id.inl"
 #include "core/strings/string_stream.inl"
 #include "core/strings/string_stream.inl"
 #include "resource/compile_options.inl"
 #include "resource/compile_options.inl"
 #include "resource/resource_manager.h"
 #include "resource/resource_manager.h"

+ 1 - 0
src/world/material.cpp

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: MIT
  * SPDX-License-Identifier: MIT
  */
  */
 
 
+#include "core/strings/string_id.inl"
 #include "resource/material_resource.h"
 #include "resource/material_resource.h"
 #include "resource/resource_manager.h"
 #include "resource/resource_manager.h"
 #include "resource/texture_resource.h"
 #include "resource/texture_resource.h"

+ 1 - 0
src/world/physics_world_bullet.cpp

@@ -14,6 +14,7 @@
 #include "core/math/quaternion.inl"
 #include "core/math/quaternion.inl"
 #include "core/math/vector3.inl"
 #include "core/math/vector3.inl"
 #include "core/memory/proxy_allocator.h"
 #include "core/memory/proxy_allocator.h"
+#include "core/strings/string_id.inl"
 #include "device/log.h"
 #include "device/log.h"
 #include "resource/physics_resource.h"
 #include "resource/physics_resource.h"
 #include "resource/resource_manager.h"
 #include "resource/resource_manager.h"

+ 1 - 0
src/world/render_world.cpp

@@ -12,6 +12,7 @@
 #include "core/math/constants.h"
 #include "core/math/constants.h"
 #include "core/math/intersection.h"
 #include "core/math/intersection.h"
 #include "core/math/matrix4x4.inl"
 #include "core/math/matrix4x4.inl"
+#include "core/strings/string_id.inl"
 #include "device/pipeline.h"
 #include "device/pipeline.h"
 #include "resource/mesh_resource.h"
 #include "resource/mesh_resource.h"
 #include "resource/resource_manager.h"
 #include "resource/resource_manager.h"