diff --git a/src/plugins/debugger/namedemangler/parsetreenodes.cpp b/src/plugins/debugger/namedemangler/parsetreenodes.cpp
index c78c97814f4..93243ac4a13 100644
--- a/src/plugins/debugger/namedemangler/parsetreenodes.cpp
+++ b/src/plugins/debugger/namedemangler/parsetreenodes.cpp
@@ -230,7 +230,7 @@ BuiltinTypeNode::BuiltinTypeNode(const BuiltinTypeNode &other)
 
 bool BuiltinTypeNode::mangledRepresentationStartsWith(char c)
 {
-    return strchr("vwbcahstijlmxynofgedzDu", c);
+    return std::strchr("vwbcahstijlmxynofgedzDu", c);
 }
 
 /*
@@ -2103,15 +2103,6 @@ template<int base> NonNegativeNumberNode<base>::NonNegativeNumberNode(const NonN
 {
 }
 
-template<int base> bool NonNegativeNumberNode<base>::mangledRepresentationStartsWith(char c)
-{
-    // Base can only be 10 or 36.
-    if (base == 10)
-        return strchr("0123456789", c);
-    else
-        return strchr("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ", c);
-}
-
 template<int base> void NonNegativeNumberNode<base>::parse()
 {
     QByteArray numberRepr;
diff --git a/src/plugins/debugger/namedemangler/parsetreenodes.h b/src/plugins/debugger/namedemangler/parsetreenodes.h
index 03cd0c53b46..32ff9356132 100644
--- a/src/plugins/debugger/namedemangler/parsetreenodes.h
+++ b/src/plugins/debugger/namedemangler/parsetreenodes.h
@@ -552,7 +552,10 @@ template<int base> class NonNegativeNumberNode : public ParseTreeNode
 public:
     typedef QSharedPointer<NonNegativeNumberNode<base> > Ptr;
     NonNegativeNumberNode(GlobalParseState *parseState) : ParseTreeNode(parseState) {}
-    static bool mangledRepresentationStartsWith(char c);
+    static bool mangledRepresentationStartsWith(char c) {
+        // Base can only be 10 or 36.
+        return (c >= '0' && c <= '9') || (base == 36 && c >= 'A' && c <= 'Z');
+    }
     quint64 number() const { return m_number; }
     QByteArray toByteArray() const;