From 986db4f2bc14b39978cf8185074fa74dacdfdeb2 Mon Sep 17 00:00:00 2001 From: Samuel Li Date: Thu, 11 Aug 2016 09:39:20 -0700 Subject: [PATCH] fix a few warnings --- vtkm/worklet/WaveletCompressor.h | 2 +- vtkm/worklet/wavelets/WaveletBase.h | 4 ++-- vtkm/worklet/wavelets/WaveletDWT.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vtkm/worklet/WaveletCompressor.h b/vtkm/worklet/WaveletCompressor.h index 02552f374..393fd553e 100644 --- a/vtkm/worklet/WaveletCompressor.h +++ b/vtkm/worklet/WaveletCompressor.h @@ -37,7 +37,7 @@ class WaveletCompressor : public vtkm::worklet::wavelets::WaveletDWT public: // Constructor - WaveletCompressor( wavelets::WaveletName wname ) : WaveletDWT( wname ) {} + WaveletCompressor( wavelets::WaveletName name ) : WaveletDWT( name ) {} // Multi-level 1D wavelet decomposition template< typename SignalArrayType, typename CoeffArrayType, typename DeviceTag > diff --git a/vtkm/worklet/wavelets/WaveletBase.h b/vtkm/worklet/wavelets/WaveletBase.h index 090797dea..a8c7040b7 100644 --- a/vtkm/worklet/wavelets/WaveletBase.h +++ b/vtkm/worklet/wavelets/WaveletBase.h @@ -52,8 +52,8 @@ class WaveletBase public: // Constructor - WaveletBase( WaveletName name ) : filter( name ), - wname ( name ) + WaveletBase( WaveletName name ) : wname ( name ), + filter( name ) { if( this->wname == CDF9_7 ) { diff --git a/vtkm/worklet/wavelets/WaveletDWT.h b/vtkm/worklet/wavelets/WaveletDWT.h index 9a0ac03a3..94d855dcb 100644 --- a/vtkm/worklet/wavelets/WaveletDWT.h +++ b/vtkm/worklet/wavelets/WaveletDWT.h @@ -40,7 +40,7 @@ class WaveletDWT : public WaveletBase public: // Constructor - WaveletDWT( WaveletName wname ) : WaveletBase( wname ) {} + WaveletDWT( WaveletName name ) : WaveletBase( name ) {} // Func: Extend 1D signal