From d2d9ba3321d59b8b2d97e0b77836b4f20e1779d5 Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Mon, 22 Feb 2021 08:44:23 -0700 Subject: [PATCH] Make connectivity structures trivially copyable It always worked to trivially copy these classes, but the compiler did not think so because copy constructors were defined. Change these constructors to be default so that the compler can properly check triviality. --- vtkm/exec/ConnectivityPermuted.h | 16 +++------------- vtkm/exec/ConnectivityStructured.h | 12 ++---------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/vtkm/exec/ConnectivityPermuted.h b/vtkm/exec/ConnectivityPermuted.h index da47f187b..5db3c29bc 100644 --- a/vtkm/exec/ConnectivityPermuted.h +++ b/vtkm/exec/ConnectivityPermuted.h @@ -27,13 +27,7 @@ class ConnectivityPermutedVisitCellsWithPoints public: using SchedulingRangeType = typename OriginalConnectivity::SchedulingRangeType; - VTKM_SUPPRESS_EXEC_WARNINGS - VTKM_EXEC_CONT - ConnectivityPermutedVisitCellsWithPoints() - : Portal() - , Connectivity() - { - } + ConnectivityPermutedVisitCellsWithPoints() = default; VTKM_EXEC_CONT ConnectivityPermutedVisitCellsWithPoints(const PermutationPortal& portal, @@ -43,12 +37,8 @@ public: { } - VTKM_EXEC_CONT - ConnectivityPermutedVisitCellsWithPoints(const ConnectivityPermutedVisitCellsWithPoints& src) - : Portal(src.Portal) - , Connectivity(src.Connectivity) - { - } + ConnectivityPermutedVisitCellsWithPoints(const ConnectivityPermutedVisitCellsWithPoints& src) = + default; ConnectivityPermutedVisitCellsWithPoints& operator=( const ConnectivityPermutedVisitCellsWithPoints& src) = default; diff --git a/vtkm/exec/ConnectivityStructured.h b/vtkm/exec/ConnectivityStructured.h index 65a30d925..0f14923c3 100644 --- a/vtkm/exec/ConnectivityStructured.h +++ b/vtkm/exec/ConnectivityStructured.h @@ -34,11 +34,7 @@ class ConnectivityStructured public: using SchedulingRangeType = typename InternalsType::SchedulingRangeType; - VTKM_EXEC_CONT - ConnectivityStructured() - : Internals() - { - } + ConnectivityStructured() = default; VTKM_EXEC_CONT ConnectivityStructured(const InternalsType& src) @@ -46,11 +42,7 @@ public: { } - VTKM_EXEC_CONT - ConnectivityStructured(const ConnectivityStructured& src) - : Internals(src.Internals) - { - } + ConnectivityStructured(const ConnectivityStructured& src) = default; VTKM_EXEC_CONT ConnectivityStructured(