LibCore: CObjects without is<T> specialization shouldn't LARP as others.

luteresa · Jun 1, 2019 · b8e705d · b8e705d
1 parent a4726b8
commit b8e705d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/AK/StdLibExtras.h b/AK/StdLibExtras.h
@@ -293,3 +293,4 @@ using AK::max;
 using AK::min;
 using AK::move;
 using AK::swap;
+using AK::RemoveConst;
diff --git a/LibCore/CObject.h b/LibCore/CObject.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <AK/Function.h>
+#include <AK/StdLibExtras.h>
 #include <AK/Vector.h>
 #include <AK/Weakable.h>
 
@@ -63,19 +64,22 @@ class CObject : public Weakable<CObject> {
 };
 
 template<typename T>
-inline bool is(const CObject&) { return true; }
+inline bool is(const CObject&) { return false; }
+
+template<>
+inline bool is<CObject>(const CObject&) { return true; }
 
 template<typename T>
 inline T& to(CObject& object)
 {
- ASSERT(is<T>(object));
+ ASSERT(is<typename RemoveConst<T>::Type>(object));
  return static_cast<T&>(object);
 }
 
 template<typename T>
 inline const T& to(const CObject& object)
 {
- ASSERT(is<T>(object));
+ ASSERT(is<typename RemoveConst<T>::Type>(object));
  return static_cast<const T&>(object);
 }