Commit 6dce5106 authored by Sean McBride's avatar Sean McBride

Remove double underscore in header guards (.txx & __vtk*_txx form)

Used the following command:

find . \( -iname *.txx -and -type f \) -exec perl -pi -w -e 's/__vtk(.*)_txx/vtk$1_txx/g;' {} \;

Fixes many, but not all, clang -Wreserved-id-macro warnings.

Change-Id: Ibedcd2ae25394d08d131d56ff2e14e9e7870ece9
parent e66a4036
......@@ -19,8 +19,8 @@
=========================================================================*/
#ifndef __vtkArrayInterpolate_txx
#define __vtkArrayInterpolate_txx
#ifndef vtkArrayInterpolate_txx
#define vtkArrayInterpolate_txx
#include "vtkArrayExtentsList.h"
#include "vtkArrayWeights.h"
......
......@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#ifndef __vtkArrayIteratorTemplate_txx
#define __vtkArrayIteratorTemplate_txx
#ifndef vtkArrayIteratorTemplate_txx
#define vtkArrayIteratorTemplate_txx
#include "vtkArrayIteratorTemplate.h"
......
......@@ -17,8 +17,8 @@
// instantiation is not needed. It just includes the corresponding
// .txx file, so only the name is important.
#ifndef __vtkArrayIteratorTemplateImplicit_txx
#define __vtkArrayIteratorTemplateImplicit_txx
#ifndef vtkArrayIteratorTemplateImplicit_txx
#define vtkArrayIteratorTemplateImplicit_txx
#include "vtkArrayIteratorTemplate.txx"
......
......@@ -19,8 +19,8 @@
=========================================================================*/
#ifndef __vtkArrayPrint_txx
#define __vtkArrayPrint_txx
#ifndef vtkArrayPrint_txx
#define vtkArrayPrint_txx
#include "vtkArrayCoordinates.h"
#include <algorithm>
......
......@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#ifndef __vtkDataArrayPrivate_txx
#define __vtkDataArrayPrivate_txx
#ifndef vtkDataArrayPrivate_txx
#define vtkDataArrayPrivate_txx
#include "vtkTypeTraits.h"
......
......@@ -12,8 +12,8 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#ifndef __vtkDataArrayTemplate_txx
#define __vtkDataArrayTemplate_txx
#ifndef vtkDataArrayTemplate_txx
#define vtkDataArrayTemplate_txx
#include "vtkDataArrayTemplate.h"
#include "vtkDataArrayPrivate.txx"
......
......@@ -17,8 +17,8 @@
// instantiation is not needed. It just includes the corresponding
// .txx file, so only the name is important.
#ifndef __vtkDataArrayTemplateImplicit_txx
#define __vtkDataArrayTemplateImplicit_txx
#ifndef vtkDataArrayTemplateImplicit_txx
#define vtkDataArrayTemplateImplicit_txx
#include "vtkDataArrayTemplate.txx"
......
......@@ -19,8 +19,8 @@
=========================================================================*/
#ifndef __vtkDenseArray_txx
#define __vtkDenseArray_txx
#ifndef vtkDenseArray_txx
#define vtkDenseArray_txx
///////////////////////////////////////////////////////////////////////////////
// vtkDenseArray::MemoryBlock
......
......@@ -13,8 +13,8 @@
==============================================================================*/
#ifndef __vtkMappedDataArray_txx
#define __vtkMappedDataArray_txx
#ifndef vtkMappedDataArray_txx
#define vtkMappedDataArray_txx
#include "vtkMappedDataArray.h"
......@@ -163,4 +163,4 @@ void vtkMappedDataArray<Scalar>::Modified()
this->TemporaryScalarPointerSize = 0;
}
#endif //__vtkMappedDataArray_txx
#endif //vtkMappedDataArray_txx
......@@ -19,8 +19,8 @@
=========================================================================*/
#ifndef __vtkSparseArray_txx
#define __vtkSparseArray_txx
#ifndef vtkSparseArray_txx
#define vtkSparseArray_txx
#include <algorithm>
#include <limits>
......
......@@ -13,8 +13,8 @@
=========================================================================*/
#ifndef __vtkTypedDataArray_txx
#define __vtkTypedDataArray_txx
#ifndef vtkTypedDataArray_txx
#define vtkTypedDataArray_txx
#include "vtkTypedDataArray.h"
......@@ -73,4 +73,4 @@ vtkTypedDataArray<Scalar>::FastDownCast(vtkAbstractArray *source)
}
}
#endif //__vtkTypedDataArray_txx
#endif //vtkTypedDataArray_txx
......@@ -15,8 +15,8 @@
// Include blockers needed since vtkImageIterator.h includes this file
// when VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION is defined.
#ifndef __vtkImageIterator_txx
#define __vtkImageIterator_txx
#ifndef vtkImageIterator_txx
#define vtkImageIterator_txx
#include "vtkImageIterator.h"
#include "vtkImageData.h"
......
......@@ -14,8 +14,8 @@
=========================================================================*/
// Include blockers needed since vtkImageProgressIterator.h includes
// this file when VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION is defined.
#ifndef __vtkImageProgressIterator_txx
#define __vtkImageProgressIterator_txx
#ifndef vtkImageProgressIterator_txx
#define vtkImageProgressIterator_txx
#include "vtkImageProgressIterator.h"
#include "vtkImageData.h"
......
......@@ -15,8 +15,8 @@
#include "vtkQuaternion.h"
#ifndef __vtkQuaternion_txx
#define __vtkQuaternion_txx
#ifndef vtkQuaternion_txx
#define vtkQuaternion_txx
#include "vtkMath.h"
......
......@@ -15,8 +15,8 @@
// Include blockers needed since vtkImageStencilIterator.h includes
// this file when VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION is defined.
#ifndef __vtkImageStencilIterator_txx
#define __vtkImageStencilIterator_txx
#ifndef vtkImageStencilIterator_txx
#define vtkImageStencilIterator_txx
#include "vtkImageStencilIterator.h"
#include "vtkImageData.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