#5977: DeclarationManager treats decl names case-insensitively during…

… lookup
codereader · Jul 2, 2022 · f30807c · f30807c
1 parent 3250f2b
commit f30807c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/ideclmanager.h b/include/ideclmanager.h
@@ -64,8 +64,6 @@ class IDeclaration
     virtual void setParseStamp(std::size_t parseStamp) = 0;
 };
 
-using NamedDeclarations = std::map<std::string, IDeclaration::Ptr>;
-
 // Factory interface being able to create a single declaration type
 class IDeclarationCreator
 {

diff --git a/radiantcore/decl/DeclarationManager.h b/radiantcore/decl/DeclarationManager.h
@@ -6,6 +6,7 @@
 #include <set>
 #include <vector>
 #include <memory>
+#include "string/string.h"
 
 #include "DeclarationFile.h"
 
@@ -18,6 +19,9 @@ class DeclarationManager :
     public IDeclarationManager
 {
 private:
+    // Declaration names are compared case-insensitively
+    using NamedDeclarations = std::map<std::string, IDeclaration::Ptr, string::ILess>;
+
     std::map<std::string, IDeclarationCreator::Ptr> _creatorsByTypename;
     std::map<Type, IDeclarationCreator::Ptr> _creatorsByType;
     std::recursive_mutex _creatorLock;