Merge CPlusPlus::NameId and CPlusPlus::Identifier.

1 files changed, 0 insertions, 20 deletions

diff --git a/src/shared/cplusplus/Control.cpp b/src/shared/cplusplus/Control.cpp
index 050171eb6a..14e302a039 100644
--- a/src/shared/cplusplus/Control.cpp
+++ b/src/shared/cplusplus/Control.cpp
@@ -129,14 +129,6 @@ template <> struct Compare<ArrayType>
     }
 };
 
-template <> struct Compare<NameId>
-{
-    bool operator()(const NameId &name, const NameId &otherName) const
-    {
-        return name.identifier() < otherName.identifier();
-    }
-};
-
 template <> struct Compare<DestructorNameId>
 {
     bool operator()(const DestructorNameId &name, const DestructorNameId &otherName) const
@@ -256,14 +248,6 @@ public:
         delete_array_entries(symbols);
     }
 
-    const NameId *findOrInsertNameId(const Identifier *id)
-    {
-        if (! id)
-            return 0;
-
-        return nameIds.intern(NameId(id));
-    }
-
     template <typename _Iterator>
     const TemplateNameId *findOrInsertTemplateNameId(const Identifier *id, _Iterator first, _Iterator last)
     {
@@ -498,7 +482,6 @@ public:
     // ### replace std::map with lookup tables. ASAP!
 
     // names
-    Table<NameId> nameIds;
     Table<DestructorNameId> destructorNameIds;
     Table<OperatorNameId> operatorNameIds;
     Table<ConversionNameId> conversionNameIds;
@@ -616,9 +599,6 @@ const NumericLiteral *Control::numericLiteral(const char *chars)
     return numericLiteral(chars, length);
 }
 
-const NameId *Control::nameId(const Identifier *id)
-{ return d->findOrInsertNameId(id); }
-
 const TemplateNameId *Control::templateNameId(const Identifier *id,
                                               const FullySpecifiedType *const args,
                                               unsigned argv)