File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -3127,6 +3127,8 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
31273127 continue ;
31283128 if (classFuncIt.tokenDef ->isExpandedMacro ())
31293129 continue ;
3130+ if (classFuncIt.templateDef )
3131+ continue ;
31303132 for (const Function& parentClassFuncIt : parentClassIt.type ->classScope ->functionList ) {
31313133 if (classFuncIt.name () == parentClassFuncIt.name () &&
31323134 (parentClassFuncIt.access != AccessControl::Private || !skipPrivate) &&
Original file line number Diff line number Diff line change @@ -734,6 +734,13 @@ class TestClass : public TestFixture {
734734 " void Two() = delete;\n "
735735 " };\n " );
736736 ASSERT_EQUALS (" " , errout_str ());
737+
738+ checkDuplInheritedMembers (" struct B { void f(); };\n " // #14583
739+ " struct D : B {\n "
740+ " template <typename>\n "
741+ " void f();\n "
742+ " };\n " );
743+ ASSERT_EQUALS (" " , errout_str ());
737744 }
738745
739746#define checkCopyConstructor (...) checkCopyConstructor_( __FILE__, __LINE__, __VA_ARGS__)
You can’t perform that action at this time.
0 commit comments