cpp2util.h: Fix typeid(T) -> Typeid<T> usage with -fno-rtti.

Author: prenaux

include/cpp2util.h

@@ -433,22 +433,22 @@ template<typename T>
 auto Typeid() -> decltype(auto) {
 #ifdef CPP2_NO_RTTI
     Type.expects(
-        !"'any' dynamic casting is disabled with -fno-rtti", // more likely to appear on console 
+        !"'any' dynamic casting is disabled with -fno-rtti", // more likely to appear on console
          "'any' dynamic casting is disabled with -fno-rtti"  // make message available to hooked handlers
     );
 #else
     return typeid(T);
 #endif
 }
 
-//  We don't need typeid(expr) yet -- uncomment this if/when we need it
+// We don't need typeid(expr) yet -- uncomment this if/when we need it
 //auto Typeid( [[maybe_unused]] auto&& x ) -> decltype(auto) {
-//#ifdef CPP2_DISABLE_RTTI
-//    Type.expects(
-//        !"<write appropriate error message here>"
-//    );
+//#ifdef CPP2_NO_RTTI
+//   Type.expects(
+//       !"<write appropriate error message here>"
+//   );
 //#else
-//    return typeid(CPP2_FORWARD(x));
+//   return typeid(CPP2_FORWARD(x));
 //#endif
 //}
 
@@ -1144,7 +1144,7 @@ auto as( std::variant<Ts...> const& x ) -> decltype(auto) {
 template<typename T, typename X>
     requires (std::is_same_v<X,std::any> && !std::is_same_v<T,std::any> && !std::is_same_v<T,empty>)
 constexpr auto is( X const& x ) -> bool
-    { return x.type() == typeid(T); }
+    { return x.type() == Typeid<T>(); }
 
 template<typename T, typename X>
     requires (std::is_same_v<X,std::any> && std::is_same_v<T,empty>)