Procházet zdrojové kódy

core: put inline functions in guid.inl

Daniele Bartolini před 5 roky
rodič
revize
d3fb088f10

+ 0 - 28
src/core/guid.cpp

@@ -96,32 +96,4 @@ namespace guid
 
 
 } // namespace guid
 } // namespace guid
 
 
-bool operator==(const Guid& a, const Guid& b)
-{
-	return a.data1 == b.data1
-		&& a.data2 == b.data2
-		&& a.data3 == b.data3
-		&& a.data4 == b.data4
-		;
-}
-
-bool operator<(const Guid& a, const Guid& b)
-{
-	if (a.data1 != b.data1)
-		return a.data1 < b.data1;
-	if (a.data2 != b.data2)
-		return a.data2 < b.data2;
-	if (a.data3 != b.data3)
-		return a.data3 < b.data3;
-	if (a.data4 != b.data4)
-		return a.data4 < b.data4;
-
-	return false;
-}
-
-u32 hash<Guid>::operator()(const Guid& id) const
-{
-	return id.data1;
-}
-
 } // namespace crown
 } // namespace crown

+ 38 - 0
src/core/guid.inl

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2012-2020 Daniele Bartolini and individual contributors.
+ * License: https://github.com/dbartolini/crown/blob/master/LICENSE
+ */
+
+#include "core/guid.h"
+
+namespace crown
+{
+inline bool operator==(const Guid& a, const Guid& b)
+{
+	return a.data1 == b.data1
+		&& a.data2 == b.data2
+		&& a.data3 == b.data3
+		&& a.data4 == b.data4
+		;
+}
+
+inline bool operator<(const Guid& a, const Guid& b)
+{
+	if (a.data1 != b.data1)
+		return a.data1 < b.data1;
+	if (a.data2 != b.data2)
+		return a.data2 < b.data2;
+	if (a.data3 != b.data3)
+		return a.data3 < b.data3;
+	if (a.data4 != b.data4)
+		return a.data4 < b.data4;
+
+	return false;
+}
+
+inline u32 hash<Guid>::operator()(const Guid& id) const
+{
+	return id.data1;
+}
+
+} // namespace crown

+ 1 - 1
src/core/unit_tests.cpp

@@ -13,7 +13,7 @@
 #include "core/containers/hash_set.inl"
 #include "core/containers/hash_set.inl"
 #include "core/containers/vector.inl"
 #include "core/containers/vector.inl"
 #include "core/filesystem/path.h"
 #include "core/filesystem/path.h"
-#include "core/guid.h"
+#include "core/guid.inl"
 #include "core/json/json.h"
 #include "core/json/json.h"
 #include "core/json/sjson.h"
 #include "core/json/sjson.h"
 #include "core/math/aabb.inl"
 #include "core/math/aabb.inl"

+ 1 - 0
src/resource/data_compiler.cpp

@@ -13,6 +13,7 @@
 #include "core/filesystem/file.h"
 #include "core/filesystem/file.h"
 #include "core/filesystem/filesystem_disk.h"
 #include "core/filesystem/filesystem_disk.h"
 #include "core/filesystem/path.h"
 #include "core/filesystem/path.h"
+#include "core/guid.inl"
 #include "core/json/json_object.inl"
 #include "core/json/json_object.inl"
 #include "core/json/sjson.h"
 #include "core/json/sjson.h"
 #include "core/memory/allocator.h"
 #include "core/memory/allocator.h"

+ 1 - 1
src/resource/state_machine_resource.cpp

@@ -9,7 +9,7 @@
 #include "core/containers/vector.inl"
 #include "core/containers/vector.inl"
 #include "core/error/error.h"
 #include "core/error/error.h"
 #include "core/filesystem/file.h"
 #include "core/filesystem/file.h"
-#include "core/guid.h"
+#include "core/guid.inl"
 #include "core/json/json_object.inl"
 #include "core/json/json_object.inl"
 #include "core/json/sjson.h"
 #include "core/json/sjson.h"
 #include "core/math/math.h"
 #include "core/math/math.h"

+ 1 - 0
src/resource/unit_compiler.cpp

@@ -9,6 +9,7 @@
 
 
 #include "core/containers/array.inl"
 #include "core/containers/array.inl"
 #include "core/containers/hash_map.inl"
 #include "core/containers/hash_map.inl"
+#include "core/guid.inl"
 #include "core/json/json_object.inl"
 #include "core/json/json_object.inl"
 #include "core/json/sjson.h"
 #include "core/json/sjson.h"
 #include "core/math/math.h"
 #include "core/math/math.h"