[Bf-blender-cvs] [4c988eb3e14] master: Fix error with makefiles compilation

Germano Cavalcante noreply at git.blender.org
Wed Nov 17 00:47:00 CET 2021


Commit: 4c988eb3e144712b98fddc97b2e669e88a23eaa8
Author: Germano Cavalcante
Date:   Tue Nov 16 20:39:35 2021 -0300
Branches: master
https://developer.blender.org/rB4c988eb3e144712b98fddc97b2e669e88a23eaa8

Fix error with makefiles compilation

Use 'template' keyword to treat 'is' as a dependent template name

===================================================================

M	source/blender/functions/FN_generic_virtual_array.hh

===================================================================

diff --git a/source/blender/functions/FN_generic_virtual_array.hh b/source/blender/functions/FN_generic_virtual_array.hh
index 5d33a05a693..b822f3a7c33 100644
--- a/source/blender/functions/FN_generic_virtual_array.hh
+++ b/source/blender/functions/FN_generic_virtual_array.hh
@@ -346,7 +346,7 @@ template<typename T> class VArrayImpl_For_GVArray : public VArrayImpl<T> {
   VArrayImpl_For_GVArray(GVArray varray) : VArrayImpl<T>(varray.size()), varray_(std::move(varray))
   {
     BLI_assert(varray_);
-    BLI_assert(varray_.type().is<T>());
+    BLI_assert(varray_.type().template is<T>());
   }
 
  protected:
@@ -496,7 +496,7 @@ template<typename T> class VMutableArrayImpl_For_GVMutableArray : public VMutabl
       : VMutableArrayImpl<T>(varray.size()), varray_(varray)
   {
     BLI_assert(varray_);
-    BLI_assert(varray_.type().is<T>());
+    BLI_assert(varray_.type().template is<T>());
   }
 
  private:



More information about the Bf-blender-cvs mailing list