Commit e89fdcff authored by Sean McBride's avatar Sean McBride

Remove double underscore in header guards (.h & __vtk*_h form)

Used the following command:

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

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

Change-Id: I694ff053cb204c70e37b261296f496064d91fc07
parent 5a668f9e

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxContour_h
#define __vtkDaxContour_h
#ifndef vtkDaxContour_h
#define vtkDaxContour_h
#include "vtkContourFilter.h"
#include "vtkAcceleratorsDaxModule.h" //required for correct implementation
......
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxContourImpl_h
#define __vtkDaxContourImpl_h
#ifndef vtkDaxContourImpl_h
#define vtkDaxContourImpl_h
// Common code
#include "vtkDaxConfig.h"
......
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxDetailCommon_h
#define __vtkDaxDetailCommon_h
#ifndef vtkDaxDetailCommon_h
#define vtkDaxDetailCommon_h
#include "vtkCellTypes.h"
#include "vtkDataSet.h"
......
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxThreshold_h
#define __vtkDaxThreshold_h
#ifndef vtkDaxThreshold_h
#define vtkDaxThreshold_h
#include "vtkThreshold.h"
#include "vtkAcceleratorsDaxModule.h" //required for correct implementation
......@@ -41,4 +41,4 @@ private:
void operator=(const vtkDaxThreshold&); // Not implemented
};
#endif // __vtkDaxThreshold_h
#endif // vtkDaxThreshold_h
......@@ -14,8 +14,8 @@
//
//=============================================================================
#ifndef __vtkDaxThresholdImpl_h
#define __vtkDaxThresholdImpl_h
#ifndef vtkDaxThresholdImpl_h
#define vtkDaxThresholdImpl_h
// Common code
#include "vtkDaxConfig.h"
......
......@@ -21,8 +21,8 @@
// .SECTION See Also
// vtkPistonToDataSet
#ifndef __vtkDataSetToPiston_h
#define __vtkDataSetToPiston_h
#ifndef vtkDataSetToPiston_h
#define vtkDataSetToPiston_h
#include "vtkPistonAlgorithm.h"
......
......@@ -30,8 +30,8 @@
// class breaks out the downstream requests into separate functions such as
// ExecuteData and ExecuteInformation.
#ifndef __vtkPistonAlgorithm_h
#define __vtkPistonAlgorithm_h
#ifndef vtkPistonAlgorithm_h
#define vtkPistonAlgorithm_h
#include "vtkAcceleratorsPistonModule.h" // For export macro
#include "vtkAlgorithm.h"
......
......@@ -16,8 +16,8 @@
// .SECTION Description
// This filter uses LANL's Piston library to isocontour on the GPU.
#ifndef __vtkPistonContour_h
#define __vtkPistonContour_h
#ifndef vtkPistonContour_h
#define vtkPistonContour_h
#include "vtkPistonAlgorithm.h"
......
......@@ -25,8 +25,8 @@
// .SECTION See Also
// vtkPistonReference
#ifndef __vtkPistonDataObject_h
#define __vtkPistonDataObject_h
#ifndef vtkPistonDataObject_h
#define vtkPistonDataObject_h
#include "vtkAcceleratorsPistonModule.h" // For export macro
#include "vtkDataObject.h"
......
......@@ -18,8 +18,8 @@
// The vtk_polydata struct is important as that is how piston's polygonal
// results get brought back to the CPU.
#ifndef __vtkPistonDataWrangling_h
#define __vtkPistonDataWrangling_h
#ifndef vtkPistonDataWrangling_h
#define vtkPistonDataWrangling_h
#include <thrust/version.h>
#if THRUST_VERSION >= 100600
......@@ -67,5 +67,5 @@ struct float4tofloat3 : thrust::unary_function<float4, float3>
} //namespace
#endif //__vtkPistonDataWrangling_h
#endif //vtkPistonDataWrangling_h
// VTK-HeaderTest-Exclude: vtkPistonDataWrangling.h
......@@ -18,8 +18,8 @@
// The important capability it has is to produce images without bringing
// data back to the CPU.
#ifndef __vtkPistonMapper_h
#define __vtkPistonMapper_h
#ifndef vtkPistonMapper_h
#define vtkPistonMapper_h
#include "vtkAcceleratorsPistonModule.h" // For export macro
#include "vtkMapper.h"
......
......@@ -17,8 +17,8 @@
// Used in vtkPistonMapper to determine data range as part of color mapping
// process.
#ifndef __vtkPistonMinMax_h
#define __vtkPistonMinMax_h
#ifndef vtkPistonMinMax_h
#define vtkPistonMinMax_h
#include <thrust/device_vector.h>
#include <thrust/host_vector.h>
......@@ -93,5 +93,5 @@ namespace vtkPiston
}
}
#endif // __vtkPistonMinMax_h
#endif // vtkPistonMinMax_h
// VTK-HeaderTest-Exclude: vtkPistonMinMax.h
......@@ -18,8 +18,8 @@
// vtkPistonMapper uses this class to interface vtkScalarsToColors to GPU
// side code that implements color mapping.
#ifndef __vtkPistonScalarsColors_h
#define __vtkPistonScalarsColors_h
#ifndef vtkPistonScalarsColors_h
#define vtkPistonScalarsColors_h
#include "vtkAcceleratorsPistonModule.h" // For export macro
#include "vtkObject.h"
......@@ -101,4 +101,4 @@ private:
void operator=(const vtkPistonScalarsColors&); // Not implemented.
};
#endif // __vtkPistonScalarsColors_h
#endif // vtkPistonScalarsColors_h
......@@ -16,8 +16,8 @@
// .SECTION Description
// This filter uses LANL's Piston library to slice on the GPU.
#ifndef __vtkPistonSlice_h
#define __vtkPistonSlice_h
#ifndef vtkPistonSlice_h
#define vtkPistonSlice_h
#include "vtkPistonAlgorithm.h"
......
......@@ -20,8 +20,8 @@
// keeps the same data type while producing a result which is verifiably
// correct.
#ifndef __vtkPistonSort_h
#define __vtkPistonSort_h
#ifndef vtkPistonSort_h
#define vtkPistonSort_h
#include "vtkPistonAlgorithm.h"
......
......@@ -16,8 +16,8 @@
// .SECTION Description
// This filter uses LANL's Piston library to isocontour on the GPU.
#ifndef __vtkPistonThreshold_h
#define __vtkPistonThreshold_h
#ifndef vtkPistonThreshold_h
#define vtkPistonThreshold_h
#include "vtkPistonAlgorithm.h"
......
......@@ -21,8 +21,8 @@
// .SECTION See Also
// vtkDataSetToPiston
#ifndef __vtkPistonToDataSet_h
#define __vtkPistonToDataSet_h
#ifndef vtkPistonToDataSet_h
#define vtkPistonToDataSet_h
#include "vtkPistonAlgorithm.h"
......
......@@ -45,8 +45,8 @@
// old Limit values in NonLogUnscaled{Min,Max}Limit so that behavior is
// consistent when LogScale is changed from false to true and back again.
#ifndef __vtkAxis_h
#define __vtkAxis_h
#ifndef vtkAxis_h
#define vtkAxis_h
#include "vtkChartsCoreModule.h" // For export macro
#include "vtkContextItem.h"
......@@ -581,4 +581,4 @@ private:
//ETX
};
#endif //__vtkAxis_h
#endif //vtkAxis_h
......@@ -22,8 +22,8 @@
// .SECTION See Also
// vtkAxis
#ifndef __vtkAxisExtended_h
#define __vtkAxisExtended_h
#ifndef vtkAxisExtended_h
#define vtkAxisExtended_h
#endif
#include "vtkChartsCoreModule.h" // For export macro
......
......@@ -22,8 +22,8 @@
// annotated values from the vtkScalarsToColors that you wish to include
// within the legend.
#ifndef __vtkCategoryLegend_h