more template keywords

BlueQuartzSoftware · Aug 20, 2024 · 87fa2bb · 87fa2bb
1 parent c982c56
commit 87fa2bb
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 28 deletions.
diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeArrayHistogram.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeArrayHistogram.cpp
@@ -33,7 +33,7 @@ class GenerateHistogramFromData
 
   void operator()() const
   {
-    const auto& inputStore = m_InputArray.getIDataStoreRefAs<AbstractDataStore<Type>>();
+    const auto& inputStore = m_InputArray.template getIDataStoreRefAs<AbstractDataStore<Type>>();
     auto end = inputStore.getSize();
 
     // tuple visualization: Histogram = {(bin maximum, count), (bin maximum, count), ... }

diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeKMeans.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ComputeKMeans.cpp
@@ -18,8 +18,8 @@ class ComputeKMeansTemplate
   ComputeKMeansTemplate(ComputeKMeans* filter, const IDataArray* inputIDataArray, IDataArray* meansIDataArray, const std::unique_ptr<MaskCompare>& maskDataArray, usize numClusters,
                         Int32AbstractDataStore& fIds, ClusterUtilities::DistanceMetric distMetric, std::mt19937_64::result_type seed)
   : m_Filter(filter)
-  , m_InputArray(inputIDataArray->getIDataStoreRefAs<AbstractDataStoreT>())
-  , m_Means(meansIDataArray->getIDataStoreRefAs<AbstractDataStoreT>())
+  , m_InputArray(inputIDataArray->template getIDataStoreRefAs<AbstractDataStoreT>())
+  , m_Means(meansIDataArray->template getIDataStoreRefAs<AbstractDataStoreT>())
   , m_Mask(maskDataArray)
   , m_NumClusters(numClusters)
   , m_FeatureIds(fIds)

diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/DBSCAN.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/DBSCAN.cpp
@@ -306,22 +306,22 @@ struct DBSCANFunctor
     {
       if(useRandom)
       {
-        DBSCANTemplate<T, true, true>(filter, inputIDataArray.getIDataStoreRefAs<AbstractDataStore<T>>(), maskCompare, fIds.getDataStoreRef(), epsilon, minPoints, distMetric, seed)();
+        DBSCANTemplate<T, true, true>(filter, inputIDataArray.template getIDataStoreRefAs<AbstractDataStore<T>>(), maskCompare, fIds.getDataStoreRef(), epsilon, minPoints, distMetric, seed)();
       }
       else
       {
-        DBSCANTemplate<T, true, false>(filter, inputIDataArray.getIDataStoreRefAs<AbstractDataStore<T>>(), maskCompare, fIds.getDataStoreRef(), epsilon, minPoints, distMetric, seed)();
+        DBSCANTemplate<T, true, false>(filter, inputIDataArray.template getIDataStoreRefAs<AbstractDataStore<T>>(), maskCompare, fIds.getDataStoreRef(), epsilon, minPoints, distMetric, seed)();
       }
     }
     else
     {
       if(useRandom)
       {
-        DBSCANTemplate<T, false, true>(filter, inputIDataArray.getIDataStoreRefAs<AbstractDataStore<T>>(), maskCompare, fIds.getDataStoreRef(), epsilon, minPoints, distMetric, seed)();
+        DBSCANTemplate<T, false, true>(filter, inputIDataArray.template getIDataStoreRefAs<AbstractDataStore<T>>(), maskCompare, fIds.getDataStoreRef(), epsilon, minPoints, distMetric, seed)();
       }
       else
       {
-        DBSCANTemplate<T, false, false>(filter, inputIDataArray.getIDataStoreRefAs<AbstractDataStore<T>>(), maskCompare, fIds.getDataStoreRef(), epsilon, minPoints, distMetric, seed)();
+        DBSCANTemplate<T, false, false>(filter, inputIDataArray.template getIDataStoreRefAs<AbstractDataStore<T>>(), maskCompare, fIds.getDataStoreRef(), epsilon, minPoints, distMetric, seed)();
       }
     }
   }

diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.cpp
@@ -26,7 +26,7 @@ struct CopyDataFunctor
   void operator()(const IDataArray* srcIArray, IDataArray* destIArray, const std::vector<bool>& maskArray)
   {
     const auto& srcArray = srcIArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
-    auto& destArray = destIArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& destArray = destIArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     bool useMask = !maskArray.empty();
     usize destTupleIdx = 0;

diff --git a/...lnxCore/src/SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp b/...lnxCore/src/SimplnxCore/Filters/Algorithms/ReplaceElementAttributesWithNeighborValues.cpp
@@ -96,7 +96,7 @@ struct ExecuteTemplate
   void operator()(const ImageGeom& imageGeom, IDataArray* inputIDataArray, int32 comparisonAlgorithm, float thresholdValue, bool loopUntilDone, const std::atomic_bool& shouldCancel,
                   const IFilter::MessageHandler& messageHandler)
   {
-    const auto& inputStore = inputIDataArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& inputStore = inputIDataArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     const size_t totalPoints = inputStore.getNumberOfTuples();
 

diff --git a/...lugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp b/...lugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp
@@ -84,7 +84,7 @@ Result<> WriteAvizoRectilinearCoordinate::writeData(FILE* outputFile) const
 
   fprintf(outputFile, "@1 # FeatureIds in z, y, x with X moving fastest, then Y, then Z\n");
 
-  const auto& featureIds = m_DataStructure.getDataAs<IDataArray>(m_InputValues->FeatureIdsArrayPath)->getIDataStoreRefAs<DataStore<int32>>();
+  const auto& featureIds = m_DataStructure.getDataAs<IDataArray>(m_InputValues->FeatureIdsArrayPath)->template getIDataStoreRefAs<DataStore<int32>>();
   const usize totalPoints = featureIds.getNumberOfTuples();
 
   if(m_InputValues->WriteBinaryFile)

diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp
@@ -87,7 +87,7 @@ Result<> WriteAvizoUniformCoordinate::writeData(FILE* outputFile) const
 {
   fprintf(outputFile, "@1\n");
 
-  const auto& featureIds = m_DataStructure.getDataAs<IDataArray>(m_InputValues->FeatureIdsArrayPath)->getIDataStoreRefAs<DataStore<int32>>();
+  const auto& featureIds = m_DataStructure.getDataAs<IDataArray>(m_InputValues->FeatureIdsArrayPath)->template getIDataStoreRefAs<DataStore<int32>>();
   const usize totalPoints = featureIds.getNumberOfTuples();
 
   if(m_InputValues->WriteBinaryFile)

diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeNeighborListStatisticsFilter.cpp
@@ -56,37 +56,37 @@ class ComputeNeighborListStatisticsImpl
     using DataArrayType = DataArray<T>;
     using StoreType = AbstractDataStore<T>;
 
-    auto* array0 = m_Length ? m_Arrays[0]->getIDataStoreAs<AbstractDataStore<uint64>>() : nullptr;
+    auto* array0 = m_Length ? m_Arrays[0]->template getIDataStoreAs<AbstractDataStore<uint64>>() : nullptr;
     if(m_Length && array0 == nullptr)
     {
       throw std::invalid_argument("ComputeNeighborListStatisticsFilter::compute() could not dynamic_cast 'Length' array to needed type. Check input array selection.");
     }
-    auto* array1 = m_Min ? m_Arrays[1]->getIDataStoreAs<StoreType>() : nullptr;
+    auto* array1 = m_Min ? m_Arrays[1]->template getIDataStoreAs<StoreType>() : nullptr;
     if(m_Min && array1 == nullptr)
     {
       throw std::invalid_argument("ComputeNeighborListStatisticsFilter::compute() could not dynamic_cast 'Min' array to needed type. Check input array selection.");
     }
-    auto* array2 = m_Max ? m_Arrays[2]->getIDataStoreAs<StoreType>() : nullptr;
+    auto* array2 = m_Max ? m_Arrays[2]->template getIDataStoreAs<StoreType>() : nullptr;
     if(m_Max && array2 == nullptr)
     {
       throw std::invalid_argument("ComputeNeighborListStatisticsFilter::compute() could not dynamic_cast 'Max' array to needed type. Check input array selection.");
     }
-    auto* array3 = m_Mean ? m_Arrays[3]->getIDataStoreAs<AbstractDataStore<float32>>() : nullptr;
+    auto* array3 = m_Mean ? m_Arrays[3]->template getIDataStoreAs<AbstractDataStore<float32>>() : nullptr;
     if(m_Mean && array3 == nullptr)
     {
       throw std::invalid_argument("ComputeNeighborListStatisticsFilter::compute() could not dynamic_cast 'Mean' array to needed type. Check input array selection.");
     }
-    auto* array4 = m_Median ? m_Arrays[4]->getIDataStoreAs<AbstractDataStore<float32>>() : nullptr;
+    auto* array4 = m_Median ? m_Arrays[4]->template getIDataStoreAs<AbstractDataStore<float32>>() : nullptr;
     if(m_Median && array4 == nullptr)
     {
       throw std::invalid_argument("ComputeNeighborListStatisticsFilter::compute() could not dynamic_cast 'Median' array to needed type. Check input array selection.");
     }
-    auto* array5 = m_StdDeviation ? m_Arrays[5]->getIDataStoreAs<AbstractDataStore<float32>>() : nullptr;
+    auto* array5 = m_StdDeviation ? m_Arrays[5]->template getIDataStoreAs<AbstractDataStore<float32>>() : nullptr;
     if(m_StdDeviation && array5 == nullptr)
     {
       throw std::invalid_argument("ComputeNeighborListStatisticsFilter::compute() could not dynamic_cast 'StdDev' array to needed type. Check input array selection.");
     }
-    auto* array6 = m_Summation ? m_Arrays[6]->getIDataStoreAs<AbstractDataStore<float32>>() : nullptr;
+    auto* array6 = m_Summation ? m_Arrays[6]->template getIDataStoreAs<AbstractDataStore<float32>>() : nullptr;
     if(m_Summation && array6 == nullptr)
     {
       throw std::invalid_argument("ComputeNeighborListStatisticsFilter::compute() could not dynamic_cast 'Summation' array to needed type. Check input array selection.");

diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp
@@ -183,7 +183,7 @@ Result<> CreateFeatureArrayFromElementArrayFilter::executeImpl(DataStructure& da
   usize maxValue = featureIds[featureIdsMaxIdx];
   auto& cellFeatureAttrMat = dataStructure.getDataRefAs<AttributeMatrix>(pCellFeatureAttributeMatrixPathValue);
 
-  auto* createdArrayStore = createdArray->getIDataStoreAs<IDataStore>();
+  auto* createdArrayStore = createdArray->template getIDataStoreAs<IDataStore>();
   createdArrayStore->resizeTuples(std::vector<usize>{maxValue + 1});
   cellFeatureAttrMat.resizeTuples(std::vector<usize>{maxValue + 1});
 

diff --git a/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp b/src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp
@@ -329,7 +329,7 @@ TEST_CASE("DREAM3DFileTest:Import/Export DREAM3D Filter Test")
     REQUIRE(importDataStructure.getData(DataPath({DataNames::k_Group1Name})) != nullptr);
     auto* dataArray = importDataStructure.getDataAs<DataArray<int8>>(DataPath({DataNames::k_ArrayName}));
     REQUIRE(dataArray != nullptr);
-    REQUIRE(dataArray->getIDataStoreAs<DataStore<int8>>() != nullptr);
+    REQUIRE(dataArray->template getIDataStoreAs<DataStore<int8>>() != nullptr);
   }
   {
     auto importPipeline = CreateImportPipeline();
@@ -340,7 +340,7 @@ TEST_CASE("DREAM3DFileTest:Import/Export DREAM3D Filter Test")
     REQUIRE(importDataStructure.getData(DataPath({DataNames::k_Group1Name})) != nullptr);
     auto* dataArray = importDataStructure.getDataAs<DataArray<int8>>(DataPath({DataNames::k_ArrayName}));
     REQUIRE(dataArray != nullptr);
-    REQUIRE(dataArray->getIDataStoreAs<EmptyDataStore<int8>>() != nullptr);
+    REQUIRE(dataArray->template getIDataStoreAs<EmptyDataStore<int8>>() != nullptr);
   }
 }
 

diff --git a/src/simplnx/DataStructure/Geometry/INodeGeometry0D.cpp b/src/simplnx/DataStructure/Geometry/INodeGeometry0D.cpp
@@ -101,7 +101,7 @@ BoundingBox3Df INodeGeometry0D::getBoundingBox() const
 
   try
   {
-    auto& vertexListStore = vertexList.getIDataStoreRefAs<const DataStore<float32>>();
+    auto& vertexListStore = vertexList.template getIDataStoreRefAs<const DataStore<float32>>();
 
     for(size_t tuple = 0; tuple < vertexListStore.getNumberOfTuples(); tuple++)
     {
@@ -130,7 +130,7 @@ Result<bool> INodeGeometry0D::isPlane(usize dimensionIndex) const
   try
   {
     const IGeometry::SharedVertexList& vertexList = getVerticesRef();
-    auto& vertexListStore = vertexList.getIDataStoreRefAs<const DataStore<float32>>();
+    auto& vertexListStore = vertexList.template getIDataStoreRefAs<const DataStore<float32>>();
 
     std::set<float32> pointSet;
     for(usize tuple = 0; tuple < vertexListStore.getNumberOfTuples(); tuple++)

diff --git a/src/simplnx/Utilities/DataArrayUtilities.hpp b/src/simplnx/Utilities/DataArrayUtilities.hpp
@@ -977,8 +977,8 @@ class CopyTupleUsingIndexList
 
   void convert(usize start, usize end) const
   {
-    const auto& oldDataStore = m_OldCellArray.getIDataStoreRefAs<AbstractDataStore<T>>();
-    auto& newDataStore = m_NewCellArray.getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& oldDataStore = m_OldCellArray.template getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& newDataStore = m_NewCellArray.template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     for(usize i = start; i < end; i++)
     {

diff --git a/src/simplnx/Utilities/ImageRotationUtilities.hpp b/src/simplnx/Utilities/ImageRotationUtilities.hpp
@@ -517,8 +517,8 @@ class RotateImageGeometryWithNearestNeighbor
     destImageGeomPtr->setSpacing(m_Params.TransformedSpacing);
     destImageGeomPtr->setOrigin(m_Params.TransformedOrigin);
 
-    const auto& oldDataStore = m_SourceArray->getIDataStoreRefAs<AbstractDataStore<T>>();
-    auto& newDataStore = m_TargetArray->getIDataStoreRefAs<AbstractDataStore<T>>();
+    const auto& oldDataStore = m_SourceArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
+    auto& newDataStore = m_TargetArray->template getIDataStoreRefAs<AbstractDataStore<T>>();
 
     Matrix4fR inverseTransform = m_TransformationMatrix.inverse();
     for(int64 k = 0; k < m_Params.zpNew; k++)

diff --git a/src/simplnx/Utilities/Math/GeometryMath.cpp b/src/simplnx/Utilities/Math/GeometryMath.cpp
@@ -34,7 +34,7 @@ BoundingBox3Df nx::core::GeometryMath::FindBoundingBoxOfVertices(INodeGeometry0D
     return {ll, ur}; // will be invalid
   }
 
-  auto& vertexListStore = vertexList.getIDataStoreRefAs<const DataStore<float32>>();
+  auto& vertexListStore = vertexList.template getIDataStoreRefAs<const DataStore<float32>>();
 
   for(size_t tuple = 0; tuple < vertexListStore.getNumberOfTuples(); tuple++)
   {