Commit e9040745 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'functorbase_proper_constructor'

8683240b  vtkm::exec::FunctorBase now properly initializes ErrorMessageBuffer.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !358
parents af3c942e 8683240b
......@@ -38,7 +38,7 @@ class FunctorBase
{
public:
VTKM_EXEC_CONT_EXPORT
FunctorBase() { }
FunctorBase(): ErrorMessage() { }
VTKM_EXEC_EXPORT
void RaiseError(const char *message) const
......
......@@ -41,7 +41,7 @@ class ErrorMessageBuffer
{
public:
VTKM_EXEC_CONT_EXPORT ErrorMessageBuffer()
: MessageBuffer(), MessageBufferSize(0) { }
: MessageBuffer(NULL), MessageBufferSize(0) { }
VTKM_EXEC_CONT_EXPORT
ErrorMessageBuffer(char *messageBuffer, vtkm::Id bufferSize)
......
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