Merge commit '08b0d22eac529307b2368a0a7a841936705d4209' into release/…

…v1.7
PipeRift · Dec 6, 2024 · c6e3794 · c6e3794
2 parents 3c1632f + 08b0d22
commit c6e3794
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/Include/PipeReflect.h b/Include/PipeReflect.h
@@ -470,9 +470,10 @@ namespace p
 	}
 
 
-	template<typename T>
+	template<typename Type>
 	TypeId RegisterTypeId()
 	{    // Static to only register once
+		using T                 = Mut<Type>;
 		static bool bRegistered = false;
 		const TypeId typeId     = GetTypeId<T>();
 		if (!bRegistered && BeginTypeId(typeId))
@@ -676,11 +677,9 @@ private:                                                                  \
                                                                                                   \
 	static void __BuildProperty(p::MetaCounter<id_name>)                                          \
 	{                                                                                             \
-		p::AddTypeProperty<decltype(name)>(                                                       \
-		    [](void* instance) {                                                                  \
+		p::AddTypeProperty<decltype(name)>([](void* instance) {                                   \
 			return (void*)&static_cast<Self*>(instance)->name;                                    \
-		    },                                                                                    \
-		    #name, p::InitPropertyFlags(flags));                                                  \
+		}, #name, p::InitPropertyFlags(flags));                                                   \
 		/* Registry next property if any */                                                       \
 		__BuildProperty(p::MetaCounter<id_name + 1>{});                                           \
 	}                                                                                             \

diff --git a/Src/PipeReflect.cpp b/Src/PipeReflect.cpp
@@ -397,7 +397,10 @@ namespace p
 
 	TPtr<BaseObject> ObjectOwnership::nextOwner{};
 
-	ObjectOwnership::ObjectOwnership() : self{}, owner{Move(nextOwner)} {}
+	ObjectOwnership::ObjectOwnership() : self{}, owner{Move(nextOwner)}
+	{
+		;
+	}
 	const TPtr<BaseObject>& ObjectOwnership::AsPtr() const
 	{
 		return self;

diff --git a/Tests/Reflection/Object.spec.cpp b/Tests/Reflection/Object.spec.cpp
@@ -6,15 +6,14 @@
 
 using namespace snowhouse;
 using namespace bandit;
-using namespace p;
 
 
-class TestObject : public Object
+class TestObject : public p::Object
 {
-	using Super = Object;
+public:
+	using Super = p::Object;
 	P_CLASS(TestObject);
 
-public:
 	bool bConstructed = false;
 
 	TestObject()
@@ -28,15 +27,15 @@ go_bandit([]() {
 	describe("Reflection.Object", []() {
 		describe("Pointers", []() {
 			it("Can create object", [&]() {
-				auto owner = MakeOwned<TestObject>();
+				auto owner = p::MakeOwned<TestObject>();
 
 				AssertThat(owner.Get(), Is().Not().EqualTo(nullptr));
 				AssertThat(owner->bConstructed, Equals(true));
 			});
 
 			it("Can create object with owner", [&]() {
-				auto owner  = MakeOwned<TestObject>();
-				auto owner2 = MakeOwned<TestObject>(owner);
+				auto owner  = p::MakeOwned<TestObject>();
+				auto owner2 = p::MakeOwned<TestObject>(owner);
 
 				AssertThat(owner2->bConstructed, Equals(true));
 				AssertThat(owner2->GetOwner().IsValid(), Equals(true));