Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistently mark variables as static const across all of vtk-m

Browse Source
This commit is contained in:
Robert Maynard 2018-02-20 14:05:23 -05:00
parent a1d5dc4550
commit ff9dcc4750
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/CellTraits.h
View File

@ -59,7 +59,7 @@ struct CellTraits
/// This defines the topological dimensions of the cell type. 3 for /// This defines the topological dimensions of the cell type. 3 for
/// polyhedra, 2 for polygons, 1 for lines, 0 for points. /// polyhedra, 2 for polygons, 1 for lines, 0 for points.
/// ///
const static vtkm::IdComponent TOPOLOGICAL_DIMENSIONS = 3; static const vtkm::IdComponent TOPOLOGICAL_DIMENSIONS = 3;
/// This tag is typedef'ed to /// This tag is typedef'ed to
/// vtkm::CellTopologicalDimensionsTag<TOPOLOGICAL_DIMENSIONS>. This provides /// vtkm::CellTopologicalDimensionsTag<TOPOLOGICAL_DIMENSIONS>. This provides

2
vtkm/benchmarking/BenchmarkDeviceAdapter.cxx
View File

@ -161,7 +161,7 @@ struct ExtendedTypes : vtkm::ListTagBase<vtkm::UInt8,
{ {
}; };
const static std::string DIVIDER(40, '-'); static const std::string DIVIDER(40, '-');
/// This class runs a series of micro-benchmarks to measure /// This class runs a series of micro-benchmarks to measure
/// performance of the parallel primitives provided by each /// performance of the parallel primitives provided by each

2
vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx
View File

@ -46,7 +46,7 @@ namespace benchmarking
#define ARRAY_SIZE (1 << 22) #define ARRAY_SIZE (1 << 22)
#define CUBE_SIZE 256 #define CUBE_SIZE 256
const static std::string DIVIDER(40, '-'); static const std::string DIVIDER(40, '-');
enum BenchmarkName enum BenchmarkName
{ {

2
vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx
View File

@ -42,7 +42,7 @@ namespace benchmarking
{ {
#define CUBE_SIZE 256 #define CUBE_SIZE 256
const static std::string DIVIDER(40, '-'); static const std::string DIVIDER(40, '-');
enum BenchmarkName enum BenchmarkName
{ {

4
vtkm/cont/ArrayHandleSwizzle.h
View File

@ -43,7 +43,7 @@ struct ComponentIsUnique;
template <vtkm::IdComponent TestValue, vtkm::IdComponent Head> template <vtkm::IdComponent TestValue, vtkm::IdComponent Head>
struct ComponentIsUnique<TestValue, Head> struct ComponentIsUnique<TestValue, Head>
{ {
const static bool IsUnique = TestValue != Head; static const bool IsUnique = TestValue != Head;
}; };
// Recursive case: // Recursive case:
@ -51,7 +51,7 @@ template <vtkm::IdComponent TestValue, vtkm::IdComponent Head, vtkm::IdComponent
struct ComponentIsUnique<TestValue, Head, Tail...> struct ComponentIsUnique<TestValue, Head, Tail...>
{ {
using Next = ComponentIsUnique<TestValue, Tail...>; using Next = ComponentIsUnique<TestValue, Tail...>;
const static bool IsUnique = TestValue != Head && Next::IsUnique; static const bool IsUnique = TestValue != Head && Next::IsUnique;
}; };
// Validate the component map. // Validate the component map.

2
vtkm/worklet/internal/ClipTables.h
View File

@ -36,7 +36,7 @@ namespace internal
// ncells, {{celltype, nverts, {edge/verts(>=100), ...}}, ...}, \n // ncells, {{celltype, nverts, {edge/verts(>=100), ...}}, ...}, \n
// values < 100 represent edges where the corresponding vertex lies // values < 100 represent edges where the corresponding vertex lies
// values >= 100 reresent existing vertices of the input cell (vertex = value - 100) // values >= 100 reresent existing vertices of the input cell (vertex = value - 100)
static vtkm::UInt8 ClipTablesData[] = { static const vtkm::UInt8 ClipTablesData[] = {
// vtkm::CELL_SHAPE_VERTEX // vtkm::CELL_SHAPE_VERTEX
0, // 0 0, // 0
1, 1,