Commit 67e4418c authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'minor-wrapping-fixes'

9189e7d3 vtkVariant: include vtkObject.h
8a8097a1 vtkTestDataArray: include vtkObjectFactory.h
46928853 vtkOStreamWrapper: hide from the wrappers
38b63023 vtkGenericDataArrayLookupHelper: don't use C++11 initializer lists
9708ba95

 vtkDataArrayIteratorMacro: don't comment line continuations
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Gobbi's avatarDavid Gobbi <david.gobbi@gmail.com>
Merge-request: !3649
parents 49f21220 9189e7d3
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
} \ } \
else \ else \
{ \ { \
/* This is not ideal, as no explicit iterator has been declared. \ /* This is not ideal, as no explicit iterator has been declared. */ \
* Cast the void pointer and hope for the best! */ \ /* Cast the void pointer and hope for the best! */ \
typedef VTK_TT vtkDAValueType; \ typedef VTK_TT vtkDAValueType; \
typedef vtkAbstractArray vtkDAContainerType _vtkDAIMUnused; \ typedef vtkAbstractArray vtkDAContainerType _vtkDAIMUnused; \
typedef vtkDAValueType* vtkDAIteratorType; \ typedef vtkDAValueType* vtkDAIteratorType; \
......
...@@ -69,8 +69,8 @@ public: ...@@ -69,8 +69,8 @@ public:
// Constructor. // Constructor.
vtkGenericDataArrayLookupHelper() vtkGenericDataArrayLookupHelper()
: AssociatedArray{nullptr}, SortedArray(nullptr), : AssociatedArray(nullptr), SortedArray(nullptr),
FirstValue{nullptr}, SortedArraySize{0} FirstValue(nullptr), SortedArraySize(0)
{ {
} }
~vtkGenericDataArrayLookupHelper() ~vtkGenericDataArrayLookupHelper()
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#ifndef vtkOStreamWrapper_h #ifndef vtkOStreamWrapper_h
#define vtkOStreamWrapper_h #define vtkOStreamWrapper_h
#ifndef __VTK_WRAP__
#include "vtkCommonCoreModule.h" #include "vtkCommonCoreModule.h"
...@@ -155,5 +156,6 @@ private: ...@@ -155,5 +156,6 @@ private:
}; };
//@} //@}
#endif
#endif #endif
// VTK-HeaderTest-Exclude: vtkOStreamWrapper.h // VTK-HeaderTest-Exclude: vtkOStreamWrapper.h
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "vtkCommonCoreModule.h" // For export macro #include "vtkCommonCoreModule.h" // For export macro
#include "vtkGenericDataArray.h" #include "vtkGenericDataArray.h"
#include "vtkObjectFactory.h" // For VTK_STANDARD_NEW_BODY
template <class ArrayT> template <class ArrayT>
class vtkTestDataArray : public vtkGenericDataArray<vtkTestDataArray<ArrayT>, class vtkTestDataArray : public vtkGenericDataArray<vtkTestDataArray<ArrayT>,
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "vtkType.h" // To define type IDs and VTK_TYPE_USE_* flags #include "vtkType.h" // To define type IDs and VTK_TYPE_USE_* flags
#include "vtkSystemIncludes.h" // To define ostream #include "vtkSystemIncludes.h" // To define ostream
#include "vtkSetGet.h" // For vtkNotUsed macro #include "vtkSetGet.h" // For vtkNotUsed macro
#include "vtkObject.h" // For vtkObject's warning support
#include "vtkStdString.h" #include "vtkStdString.h"
#include "vtkUnicodeString.h" #include "vtkUnicodeString.h"
......
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