1 files changed, 10 insertions, 10 deletions

diff --git a/src/shared/cplusplus/Scope.cpp b/src/shared/cplusplus/Scope.cpp
index 76d09eb2dc..0fae6db391 100644
--- a/src/shared/cplusplus/Scope.cpp
+++ b/src/shared/cplusplus/Scope.cpp
@@ -204,12 +204,12 @@ void Scope::enterSymbol(Symbol *symbol)
     }
 }
 
-Symbol *Scope::lookat(Name *name) const
+Symbol *Scope::lookat(const Name *name) const
 {
     if (! name)
         return 0;
 
-    else if (OperatorNameId *opId = name->asOperatorNameId())
+    else if (const OperatorNameId *opId = name->asOperatorNameId())
         return lookat(opId->kind());
 
     else if (const Identifier *id = name->identifier())
@@ -227,21 +227,21 @@ Symbol *Scope::lookat(const Identifier *id) const
     const unsigned h = id->hashCode() % _hashSize;
     Symbol *symbol = _hash[h];
     for (; symbol; symbol = symbol->_next) {
-        Name *identity = symbol->identity();
+        const Name *identity = symbol->identity();
         if (! identity) {
             continue;
-        } else if (NameId *nameId = identity->asNameId()) {
+        } else if (const NameId *nameId = identity->asNameId()) {
             if (nameId->identifier()->isEqualTo(id))
                 break;
-        } else if (TemplateNameId *t = identity->asTemplateNameId()) {
+        } else if (const TemplateNameId *t = identity->asTemplateNameId()) {
             if (t->identifier()->isEqualTo(id))
                 break;
-        } else if (DestructorNameId *d = identity->asDestructorNameId()) {
+        } else if (const DestructorNameId *d = identity->asDestructorNameId()) {
             if (d->identifier()->isEqualTo(id))
                 break;
         } else if (identity->isQualifiedNameId()) {
-            assert(0);
-        } else if (SelectorNameId *selectorNameId = identity->asSelectorNameId()) {
+            return 0;
+        } else if (const SelectorNameId *selectorNameId = identity->asSelectorNameId()) {
             if (selectorNameId->identifier()->isEqualTo(id))
                 break;
         }
@@ -257,8 +257,8 @@ Symbol *Scope::lookat(int operatorId) const
     const unsigned h = operatorId % _hashSize;
     Symbol *symbol = _hash[h];
     for (; symbol; symbol = symbol->_next) {
-        Name *identity = symbol->identity();
-        if (OperatorNameId *op = identity->asOperatorNameId()) {
+        const Name *identity = symbol->identity();
+        if (const OperatorNameId *op = identity->asOperatorNameId()) {
             if (op->kind() == operatorId)
                 break;
         }