diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f85d6225..a317003a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -415,16 +415,16 @@ jobs: message(FATAL_ERROR "Bad exit status during coverage") endif() - - name: Upload code coverage info - if: matrix.config.coverage == 'Yes' - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./build/filtered.info # don't use a absolute path on Windows with gitBash. - exclude: build - flags: ${{ matrix.config.archive_name }} - disable_search: true - fail_ci_if_error: true + # - name: Upload code coverage info + # if: matrix.config.coverage == 'Yes' + # uses: codecov/codecov-action@v4 + # with: + # token: ${{ secrets.CODECOV_TOKEN }} + # files: ./build/filtered.info # don't use a absolute path on Windows with gitBash. + # exclude: build + # flags: ${{ matrix.config.archive_name }} + # disable_search: true + # fail_ci_if_error: true - name: Create archive if: matrix.config.upload == 'Yes' @@ -583,18 +583,18 @@ jobs: fi chmod +x ./codecov - - name: Upload code coverage info - if: matrix.config.coverage == 'Yes' - id: run_coverage_upload - uses: codecov/codecov-action@v5 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./build/filtered.info # don't use a absolute path on Windows with gitBash. - exclude: build - flags: ${{ matrix.config.archive_name }}-${{ env.ARCH }}-libcxx-${{ matrix.config.libcxx }} - disable_search: true - fail_ci_if_error: true - binary: ${{ github.workspace }}/codecov # Currently, the docker container comes without gpg + # - name: Upload code coverage info + # if: matrix.config.coverage == 'Yes' + # id: run_coverage_upload + # uses: codecov/codecov-action@v5 + # with: + # token: ${{ secrets.CODECOV_TOKEN }} + # files: ./build/filtered.info # don't use a absolute path on Windows with gitBash. + # exclude: build + # flags: ${{ matrix.config.archive_name }}-${{ env.ARCH }}-libcxx-${{ matrix.config.libcxx }} + # disable_search: true + # fail_ci_if_error: true + # binary: ${{ github.workspace }}/codecov # Currently, the docker container comes without gpg - name: Create archive if: matrix.config.upload == 'Yes' diff --git a/CodeGenerator.cpp b/CodeGenerator.cpp index 4ad899ef..dae468ac 100644 --- a/CodeGenerator.cpp +++ b/CodeGenerator.cpp @@ -4635,7 +4635,7 @@ void CodeGenerator::InsertTemplateArg(const TemplateArgument& arg) case TemplateArgument::Template: [[fallthrough]]; case TemplateArgument::TemplateExpansion: if(const auto* tmplDecl = arg.getAsTemplateOrTemplatePattern().getAsTemplateDecl()) { - mOutputFormatHelper.Append(GetName(*tmplDecl)); + mOutputFormatHelper.Append(GetName(*tmplDecl, QualifiedName::Yes)); } else if(const auto* depName = arg.getAsTemplateOrTemplatePattern().getAsDependentTemplateName(); depName->isIdentifier()) { diff --git a/tests/Namespace2Test.cpp b/tests/Namespace2Test.cpp new file mode 100644 index 00000000..ba611b22 --- /dev/null +++ b/tests/Namespace2Test.cpp @@ -0,0 +1,17 @@ +class Test +{ +public: + template + class my_array {}; + + // two type template parameters and one template template parameter: + template typename C = my_array> + class Map + { + }; +}; + + +int main(){ + Test::Map<> a; +} diff --git a/tests/Namespace2Test.expect b/tests/Namespace2Test.expect new file mode 100644 index 00000000..002a7602 --- /dev/null +++ b/tests/Namespace2Test.expect @@ -0,0 +1,32 @@ +class Test +{ + + public: + template + class my_array + { + }; + + template