Commit 8c4bbc39 authored by Sujin Philip's avatar Sujin Philip

Use C++11 =delete keyword

parent 69fe3100
......@@ -258,7 +258,7 @@ struct BindLeftBinaryOp
}
private:
void operator=(const BindLeftBinaryOp<T,BinaryOpType,ReturnT> &); // Not implemented
void operator=(const BindLeftBinaryOp<T,BinaryOpType,ReturnT> &) = delete;
};
template<typename T, typename BinaryOpType, typename ReturnT = T>
......@@ -280,7 +280,7 @@ struct BindRightBinaryOp
}
private:
void operator=(const BindRightBinaryOp<T,BinaryOpType,ReturnT> &); // Not implemented
void operator=(const BindRightBinaryOp<T,BinaryOpType,ReturnT> &) = delete;
};
} // namespace internal
......@@ -1200,11 +1200,11 @@ private:
// You are not allowed to assign to a VecCConst, so these operators are not
// implemented and are disallowed.
void operator=(const VecCConst<T> &);
void operator+=(const VecCConst<T> &);
void operator-=(const VecCConst<T> &);
void operator*=(const VecCConst<T> &);
void operator/=(const VecCConst<T> &);
void operator=(const VecCConst<T> &) = delete;
void operator+=(const VecCConst<T> &) = delete;
void operator-=(const VecCConst<T> &) = delete;
void operator*=(const VecCConst<T> &) = delete;
void operator/=(const VecCConst<T> &) = delete;
};
/// Creates a \c VecC from an input array.
......
......@@ -459,7 +459,7 @@ private:
// This type of array handle cannot exist, so do nothing.
}
void operator=(const DynamicArrayHandleTryStorage<Functor,Type> &); // Not implemented
void operator=(const DynamicArrayHandleTryStorage<Functor,Type> &) = delete;
};
template<typename Functor, typename StorageList>
......@@ -488,7 +488,7 @@ struct DynamicArrayHandleTryType {
}
private:
void operator=(const DynamicArrayHandleTryType<Functor,StorageList> &); // Not implemented
void operator=(const DynamicArrayHandleTryType<Functor,StorageList> &) = delete;
};
} // namespace detail
......
......@@ -328,7 +328,7 @@ struct DynamicCellSetTryCellSet
}
private:
void operator=(const DynamicCellSetTryCellSet<Functor> &); // Not implemented
void operator=(const DynamicCellSetTryCellSet<Functor> &) = delete;
};
} // namespace detail
......
......@@ -67,8 +67,8 @@ public:
private:
/// Some timers are ill-defined when copied, so disallow that for all timers.
VTKM_CONT Timer(const Timer<Device> &); // Not implemented.
VTKM_CONT void operator=(const Timer<Device> &); // Not implemented.
VTKM_CONT Timer(const Timer<Device> &) = delete;
VTKM_CONT void operator=(const Timer<Device> &) = delete;
vtkm::cont::DeviceAdapterTimerImplementation<Device>
TimerImplementation;
......
......@@ -130,7 +130,7 @@ struct TryExecuteImpl
}
private:
void operator=(const TryExecuteImpl<FunctorType> &); // Not implemented
void operator=(const TryExecuteImpl<FunctorType> &) = delete;
};
} // namespace detail
......
......@@ -305,11 +305,10 @@ public:
}
private:
// Not implemented
ArrayManagerExecutionThrustDevice(
ArrayManagerExecutionThrustDevice<T, StorageTag> &);
ArrayManagerExecutionThrustDevice<T, StorageTag> &) = delete;
void operator=(
ArrayManagerExecutionThrustDevice<T, StorageTag> &);
ArrayManagerExecutionThrustDevice<T, StorageTag> &) = delete;
StorageType *Storage;
};
......
......@@ -256,11 +256,10 @@ public:
}
private:
// Not implemented
ArrayManagerExecutionThrustDevice(
ArrayManagerExecutionThrustDevice<T, StorageTag> &);
ArrayManagerExecutionThrustDevice<T, StorageTag> &) = delete;
void operator=(
ArrayManagerExecutionThrustDevice<T, StorageTag> &);
ArrayManagerExecutionThrustDevice<T, StorageTag> &) = delete;
StorageType *Storage;
......
......@@ -104,8 +104,8 @@ public:
private:
// Copying CUDA events is problematic.
DeviceAdapterTimerImplementation(const DeviceAdapterTimerImplementation<vtkm::cont::DeviceAdapterTagCuda> &);
void operator=(const DeviceAdapterTimerImplementation<vtkm::cont::DeviceAdapterTagCuda> &);
DeviceAdapterTimerImplementation(const DeviceAdapterTimerImplementation<vtkm::cont::DeviceAdapterTagCuda> &) = delete;
void operator=(const DeviceAdapterTimerImplementation<vtkm::cont::DeviceAdapterTagCuda> &) = delete;
cudaEvent_t StartEvent;
cudaEvent_t EndEvent;
......
......@@ -121,11 +121,10 @@ public:
void ReleaseResources() { }
private:
// Not implemented.
ArrayManagerExecutionShareWithControl(
ArrayManagerExecutionShareWithControl<T, StorageTag> &);
ArrayManagerExecutionShareWithControl<T, StorageTag> &) = delete;
void operator=(
ArrayManagerExecutionShareWithControl<T, StorageTag> &);
ArrayManagerExecutionShareWithControl<T, StorageTag> &) = delete;
StorageType *Storage;
};
......
......@@ -262,7 +262,7 @@ private:
private:
const FunctorType Functor;
void operator=(const ScheduleKernel<FunctorType> &); // Not implemented
void operator=(const ScheduleKernel<FunctorType> &) = delete;
};
public:
......
......@@ -93,7 +93,7 @@ struct FilterDataSetPrepareForExecutionFunctor
}
private:
void operator=(FilterDataSetPrepareForExecutionFunctor<Derived,DerivedPolicy> &); // Not implemented
void operator=(FilterDataSetPrepareForExecutionFunctor<Derived,DerivedPolicy> &) = delete;
};
} // namespace detail
......
......@@ -56,7 +56,7 @@ struct PointGrad
vtkm::cont::ArrayHandle< vtkm::Vec<T,3> >* Result;
private:
void operator=(const PointGrad<DerivedPolicy,Device,T,S> &); // Not implemented
void operator=(const PointGrad<DerivedPolicy,Device,T,S> &) = delete;
};
//-----------------------------------------------------------------------------
......
......@@ -87,8 +87,7 @@ private:
}
private:
// Not implemented
void operator=(const ResolveFieldTypeAndExecuteForDevice<T,StorageTag>&);
void operator=(const ResolveFieldTypeAndExecuteForDevice<T,StorageTag>&) = delete;
};
public:
......@@ -103,8 +102,7 @@ public:
}
private:
// Not implemented
void operator=(const ResolveFieldTypeAndExecute<Derived,DerivedPolicy,ResultType> &);
void operator=(const ResolveFieldTypeAndExecute<Derived,DerivedPolicy,ResultType> &) = delete;
};
}
......
......@@ -96,8 +96,7 @@ private:
}
private:
// Not implemented
void operator=(const ResolveFieldTypeAndMapForDevice<T,StorageTag>&);
void operator=(const ResolveFieldTypeAndMapForDevice<T,StorageTag>&) = delete;
};
public:
......@@ -112,8 +111,7 @@ public:
}
private:
// Not implemented
void operator=(const ResolveFieldTypeAndMap<Derived,DerivedPolicy> &);
void operator=(const ResolveFieldTypeAndMap<Derived,DerivedPolicy> &) = delete;
};
}
......
......@@ -855,8 +855,7 @@ private:
const TransformFunctor &Transform;
const FinishFunctor &Finish;
// Not implemented
void operator=(const FunctionInterfaceDynamicTransformContContinue<OriginalFunction,NewFunction,TransformFunctor,FinishFunctor> &);
void operator=(const FunctionInterfaceDynamicTransformContContinue<OriginalFunction,NewFunction,TransformFunctor,FinishFunctor> &) = delete;
};
} // namespace detail
......
......@@ -262,7 +262,7 @@ struct Invocation
private:
// Do not allow assignment of one Invocation to another. It is too expensive.
void operator=(const Invocation<ParameterInterface,ControlInterface,ExecutionInterface,InputDomainIndex,OutputToInputMapType,VisitArrayType> &);
void operator=(const Invocation<ParameterInterface,ControlInterface,ExecutionInterface,InputDomainIndex,OutputToInputMapType,VisitArrayType> &) = delete;
};
/// Convenience function for creating an Invocation object.
......
......@@ -169,9 +169,9 @@ public:
private:
//explicitly state the BufferState doesn't support copy or move semantics
BufferState(const BufferState&);
void operator=(const BufferState&);
// BufferState doesn't support copy or move semantics
BufferState(const BufferState&) = delete;
void operator=(const BufferState&) = delete;
GLuint* OpenGLHandle;
GLenum BufferType;
......
......@@ -243,7 +243,7 @@ struct MatrixTest
}
private:
MatrixTest(); // Not implemented
MatrixTest() = delete;
};
template<typename T, int NumRow>
......@@ -531,7 +531,7 @@ struct SquareMatrixTest {
}
private:
SquareMatrixTest(); // Not implemented
SquareMatrixTest() = delete;
};
struct MatrixTestFunctor
......
......@@ -327,8 +327,7 @@ private:
const bool GenerateNormals;
EdgeWeightGenerateMetaData<ScalarType, NormalStorageType, DeviceAdapter> MetaData;
// Not implemented
void operator=(const EdgeWeightGenerate<ScalarType,NormalStorageType,DeviceAdapter> &);
void operator=(const EdgeWeightGenerate<ScalarType,NormalStorageType,DeviceAdapter> &) = delete;
};
......
......@@ -156,8 +156,7 @@ private:
void WillContinue(const T&, std::false_type) const
{ }
// Not implemented
void operator=(const DispatcherBaseTypeCheckFunctor<ContinueFunctor,TypeCheckTag,Index> &);
void operator=(const DispatcherBaseTypeCheckFunctor<ContinueFunctor,TypeCheckTag,Index> &) = delete;
};
// Uses vtkm::cont::internal::DynamicTransform and the DynamicTransformCont
......@@ -262,7 +261,7 @@ struct DispatcherBaseTransportFunctor
}
private:
void operator=(const DispatcherBaseTransportFunctor &); // Not implemented
void operator=(const DispatcherBaseTransportFunctor &) = delete;
};
} // namespace detail
......@@ -459,9 +458,9 @@ protected:
WorkletType Worklet;
private:
// These are not implemented. Dispatchers cannot be copied.
DispatcherBase(const MyType &);
void operator=(const MyType &);
// Dispatchers cannot be copied
DispatcherBase(const MyType &) = delete;
void operator=(const MyType &) = delete;
template<typename Invocation, typename InputRangeType, typename OutputRangeType, typename DeviceAdapter>
VTKM_CONT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment