Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion CodeGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
17 changes: 17 additions & 0 deletions tests/Namespace2Test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
class Test
{
public:
template<typename T>
class my_array {};

// two type template parameters and one template template parameter:
template<template<typename> typename C = my_array>
class Map
{
};
};


int main(){
Test::Map<> a;
}
32 changes: 32 additions & 0 deletions tests/Namespace2Test.expect
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
class Test
{

public:
template<typename T>
class my_array
{
};

template<template <typename> typename C = my_array>
class Map
{
};

/* First instantiated from: Namespace2Test.cpp:16 */
#ifdef INSIGHTS_USE_TEMPLATE
template<>
class Map<my_array>
{
public:
// inline constexpr Map() noexcept = default;
};

#endif
};


int main()
{
Test::Map<Test::my_array> a;
return 0;
}
11 changes: 0 additions & 11 deletions tests/NonTypeTemplateParameterPackTest.cerr

This file was deleted.

2 changes: 1 addition & 1 deletion tests/NonTypeTemplateParameterPackTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@ int main()
{
Test t;
t.summ<int, int, int>(1, 2, 3);
Test::Map<int, int, my_array> a;
Test::Map<int, int, Test::my_array> a;
return t.sum<1>();
}