Merge branch 'main' into Remove-unneeded-MakeResourceDir

Author: mcbarton

lib/CppInterOp/CXCppInterOp.cpp

@@ -437,7 +437,7 @@ CXString clang_getTypeAsString(CXQualType type) {
   clang::PrintingPolicy Policy = C.getPrintingPolicy();
   Policy.Bool = true;               // Print bool instead of _Bool.
   Policy.SuppressTagKeyword = true; // Do not print `class std::string`.
-  return makeCXString(compat::FixTypeName(QT.getAsString(Policy)));
+  return makeCXString(QT.getAsString(Policy));
 }
 
 CXQualType clang_getComplexType(CXQualType eltype) {

lib/CppInterOp/Compatibility.h

@@ -393,11 +393,6 @@ class SynthesizingCodeRAII {
 
 namespace compat {
 
-// Clang >= 14 change type name to string (spaces formatting problem)
-inline std::string FixTypeName(const std::string type_name) {
-  return type_name;
-}
-
 // Clang >= 16 (=16 with Value patch) change castAs to convertTo
 #ifdef CPPINTEROP_USE_CLING
 template <typename T> inline T convertTo(cling::Value V) {

lib/CppInterOp/CppInterOp.cpp

@@ -1729,7 +1729,7 @@ std::string GetTypeAsString(TCppType_t var) {
   Policy.SuppressTagKeyword = true; // Do not print `class std::string`.
   Policy.SuppressElaboration = true;
   Policy.FullyQualifiedName = true;
-  return compat::FixTypeName(QT.getAsString(Policy));
+  return QT.getAsString(Policy);
 }
 
 TCppType_t GetCanonicalType(TCppType_t type) {