Owners need not be objects WIP

danborthwick · Oct 27, 2015 · dcccf37 · dcccf37
1 parent d778315
commit dcccf37
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/GCPointer/src/GCPointer.h b/GCPointer/src/GCPointer.h
@@ -13,7 +13,7 @@ namespace gc
 	class gc_ptr_base
 	{
 	public:
-		using OwnerType = Object;
+		using OwnerType = void;
 
 	// TODO: Private
 	public:

diff --git a/GCPointer/src/GCPool.h b/GCPointer/src/GCPool.h
@@ -77,8 +77,9 @@ namespace gc
 				gc_ptr_base& ptr = *it->second;
 				if (ptr.impl && !ptr.impl->marked)
 				{
+					// TODO: Can't assume Object*
 					Object* pointee = (Object*)ptr.get_void();
-					nullifyPointersTo(*pointee);
+					nullifyPointersTo(pointee);
 
 					// TODO: Need to prevent this invalidating iterator
 					delete pointee;
@@ -91,12 +92,12 @@ namespace gc
 			}
 		}
 
-		void nullifyPointersTo(OwnerType& pointee)
+		void nullifyPointersTo(OwnerType* pointee)
 		{
 			for (auto entry : pointers)
 			{
 				gc_ptr_base& p = *entry.second;
-				if (p.impl && (p.impl->to == &pointee))
+				if (p.impl && (p.impl->to == pointee))
 				{
 					p.impl = nullptr;
 				}
@@ -119,7 +120,6 @@ namespace gc
 		{
 			return pointers.equal_range(gc_ptr_base::cNoOwner);
 		}
-
 	};
 
 	template<typename T>

diff --git a/GCPointer/test/GCPointerTest.cpp b/GCPointer/test/GCPointerTest.cpp
@@ -344,3 +344,27 @@ TEST_F(GCPointerTest, vectorAccumulate)
 
 	ASSERT_THAT(*joined, Eq("Once upon a time"));
 }
+
+TEST_F(GCPointerTest, OwnersNeedNotBeGCObjects)
+{
+	class NotAnObject {
+	public:
+		StringPtr value;
+		gc_ptr<NotAnObject> selfReference;
+
+		NotAnObject(string const& value)
+		: value { make_owned_gc<string>(this, value) }
+		, selfReference { make_owned_null_gc<NotAnObject>(this) }
+		{}
+
+		virtual ~NotAnObject() {}
+	};
+
+	{
+		gc_ptr<NotAnObject> p = make_gc<NotAnObject>("Pseudoantidisestablishmentarianism");
+		p->selfReference = p;
+	}
+	collectGarbage();
+}
+
+// TODO: Self referencing