Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-18 18:15:44 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'functorbase_proper_constructor'

Browse Source 
8683240b  vtkm::exec::FunctorBase now properly initializes ErrorMessageBuffer.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !358
This commit is contained in:
Robert Maynard 2016-03-14 17:44:58 -04:00 committed by Kitware Robot
commit e9040745e0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/exec/FunctorBase.h
View File

@ -38,7 +38,7 @@ class FunctorBase
{
public:
VTKM_EXEC_CONT_EXPORT
FunctorBase() { }
FunctorBase(): ErrorMessage() { }
VTKM_EXEC_EXPORT
void RaiseError(const char *message) const

2
vtkm/exec/internal/ErrorMessageBuffer.h
View File

@ -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)