Permalink
Browse files

Bug 734077 - no uniquely matching class member found for inline funct…

…ion definition where parameter argument names don't match
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Aug 3, 2014
1 parent e913d55 commit 6f0269ef3074bbc4bc16ad63a0e0a8f9b5f0ce31
Showing with 15 additions and 4 deletions.
  1. +5 −0 src/classdef.cpp
  2. +3 −0 src/classdef.h
  3. +5 −4 src/doxygen.cpp
  4. +1 −0 src/entry.h
  5. +1 −0 src/scanner.l
View
@@ -4364,6 +4364,11 @@ bool ClassDef::isPublished() const
return m_impl->spec&Entry::Published;
}
bool ClassDef::isForwardDeclared() const
{
return m_impl->spec&Entry::ForwardDecl;
}
bool ClassDef::isObjectiveC() const
{
return getLanguage()==SrcLangExt_ObjC;
View
@@ -271,6 +271,9 @@ class ClassDef : public Definition
/** Returns TRUE if this class represents an Objective-C 2.0 extension (nameless category) */
bool isExtension() const;
/** Returns TRUE if this class represents a forward declaration of a template class */
bool isForwardDeclared() const;
/** Returns the class of which this is a category (Objective-C only) */
ClassDef *categoryOf() const;
View
@@ -1256,7 +1256,7 @@ static void addClassToContext(EntryNav *rootNav)
Debug::print(Debug::Classes,0, " Found class with name %s (qualifiedName=%s -> cd=%p)\n",
cd ? cd->name().data() : root->name.data(), qualifiedName.data(),cd);
if (cd)
if (cd)
{
fullName=cd->name();
Debug::print(Debug::Classes,0," Existing class %s!\n",cd->name().data());
@@ -1276,11 +1276,12 @@ static void addClassToContext(EntryNav *rootNav)
}
//cd->setName(fullName); // change name to match docs
if (cd->templateArguments()==0)
if (cd->templateArguments()==0 || (cd->isForwardDeclared() && (root->spec&Entry::ForwardDecl)==0))
{
// this happens if a template class declared with @class is found
// before the actual definition.
ArgumentList *tArgList =
// before the actual definition or if a forward declaration has different template
// parameter names.
ArgumentList *tArgList =
getTemplateArgumentsFromName(cd->name(),root->tArgLists);
cd->setTemplateArguments(tArgList);
}
View
@@ -133,6 +133,7 @@ class Entry
static const uint64 Enum = (1ULL<<12); // for Java-style enums
static const uint64 Service = (1ULL<<13); // UNO IDL
static const uint64 Singleton = (1ULL<<14); // UNO IDL
static const uint64 ForwardDecl = (1ULL<<14); // forward declarad template classes
// member specifiers (add new items to the beginning)
static const uint64 PrivateGettable = (1ULL<<20); // C# private getter
View
@@ -5300,6 +5300,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
{
prependScope();
}
current->spec|=Entry::ForwardDecl;
current_root->addSubEntry(current);
current = new Entry;
}

0 comments on commit 6f0269e

Please sign in to comment.