Merge pull request #731 from andreasfertig/fixMissingNamespace

Fixed missing namespace if the type appears as a template parameter.

Author: andreasfertig

.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'

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()) {

tests/Namespace2Test.cpp

@@ -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;
+}

tests/Namespace2Test.expect

@@ -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;
+}

tests/NonTypeTemplateParameterPackTest.cerr

@@ -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>();
 }