diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/AlembicScene.h b/contrib/IECoreAlembic/include/IECoreAlembic/AlembicScene.h index 4a2d63b03d..8936d1b32a 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/AlembicScene.h +++ b/contrib/IECoreAlembic/include/IECoreAlembic/AlembicScene.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_ALEMBICSCENE_H -#define IECOREALEMBIC_ALEMBICSCENE_H +#pragma once #include "IECoreAlembic/Export.h" #include "IECoreAlembic/TypeIds.h" @@ -126,5 +125,3 @@ class IECOREALEMBIC_API AlembicScene : public IECoreScene::SampledSceneInterface }; } // namespace IECoreAlembic - -#endif // IECOREALEMBIC_ALEMBICSCENE_H diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/Export.h b/contrib/IECoreAlembic/include/IECoreAlembic/Export.h index 8a8883ef30..6c426ee4e2 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/Export.h +++ b/contrib/IECoreAlembic/include/IECoreAlembic/Export.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_EXPORT_H -#define IECOREALEMBIC_EXPORT_H +#pragma once #include "IECore/Export.h" @@ -46,5 +45,3 @@ #else #define IECOREALEMBIC_API IECORE_IMPORT #endif - -#endif // #ifndef IECOREALEMBIC_EXPORT_H diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h b/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h index 9485d96892..78f90e3805 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h +++ b/contrib/IECoreAlembic/include/IECoreAlembic/IGeomParamTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_IGEOMPARAMTRAITS_H -#define IECOREALEMBIC_IGEOMPARAMTRAITS_H +#pragma once #include "IECore/VectorTypedData.h" @@ -93,5 +92,3 @@ IECOREALEMBIC_SPECIALISEGEOMPARAMTRAITS( Alembic::AbcGeom::IN3dGeomParam, IECore IECOREALEMBIC_SPECIALISEGEOMPARAMTRAITS( Alembic::AbcGeom::IBoolGeomParam, IECore::BoolVectorData, IECore::GeometricData::None ) } // namespace IECoreAlembic - -#endif // IECOREALEMBIC_IGEOMPARAMTRAITS_H diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/ObjectReader.h b/contrib/IECoreAlembic/include/IECoreAlembic/ObjectReader.h index 8c5d8980ee..15b29e6788 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/ObjectReader.h +++ b/contrib/IECoreAlembic/include/IECoreAlembic/ObjectReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_OBJECTREADER_H -#define IECOREALEMBIC_OBJECTREADER_H +#pragma once #include "IECoreAlembic/Export.h" @@ -107,5 +106,3 @@ class ObjectReader : private boost::noncopyable }; } // namespace IECoreAlembic - -#endif // IECOREALEMBIC_OBJECTREADER_H diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/ObjectWriter.h b/contrib/IECoreAlembic/include/IECoreAlembic/ObjectWriter.h index 291ddfa0a8..41b31f681e 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/ObjectWriter.h +++ b/contrib/IECoreAlembic/include/IECoreAlembic/ObjectWriter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_OBJECTWRITER_H -#define IECOREALEMBIC_OBJECTWRITER_H +#pragma once #include "IECoreAlembic/Export.h" @@ -105,4 +104,3 @@ class ObjectWriter : private boost::noncopyable } // namespace IECoreAlembic -#endif // IECOREALEMBIC_OBJECTWRITER_H diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveReader.h b/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveReader.h index e69ed572e8..bd79272bf8 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveReader.h +++ b/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_PRIMITIVEREADER_H -#define IECOREALEMBIC_PRIMITIVEREADER_H +#pragma once #include "IECoreAlembic/ObjectReader.h" @@ -67,4 +66,3 @@ class PrimitiveReader : public ObjectReader #include "IECoreAlembic/PrimitiveReader.inl" -#endif // IECOREALEMBIC_PRIMITIVEREADER_H diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveReader.inl b/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveReader.inl index 8f649206d2..1874e2ec80 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveReader.inl +++ b/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveReader.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_PRIMITIVEREADER_INL -#define IECOREALEMBIC_PRIMITIVEREADER_INL +#pragma once #include "IECoreAlembic/IGeomParamTraits.h" @@ -161,5 +160,3 @@ void PrimitiveReader::readGeomParam( const T ¶m, const Alembic::Abc::ISample } } // namespace IECoreAlembic - -#endif // IECOREALEMBIC_PRIMITIVEREADER_INL diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveWriter.h b/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveWriter.h index 9448ee6e51..b2f0ce58fc 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveWriter.h +++ b/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveWriter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_PRIMITIVEWRITER_H -#define IECOREALEMBIC_PRIMITIVEWRITER_H +#pragma once #include "IECoreAlembic/ObjectWriter.h" @@ -76,4 +75,3 @@ class PrimitiveWriter : public ObjectWriter #include "IECoreAlembic/PrimitiveWriter.inl" -#endif // IECOREALEMBIC_PRIMITIVEWRITER_H diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveWriter.inl b/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveWriter.inl index 5a756afa18..5222f51d4a 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveWriter.inl +++ b/contrib/IECoreAlembic/include/IECoreAlembic/PrimitiveWriter.inl @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_PRIMITIVEWRITER_INL -#define IECOREALEMBIC_PRIMITIVEWRITER_INL +#pragma once namespace IECoreAlembic { @@ -65,5 +64,3 @@ typename GeomParamType::Sample PrimitiveWriter::geomParamSample( const IECoreSce } } // namespace IECoreAlembic - -#endif // IECOREALEMBIC_PRIMITIVEWRITER_INL diff --git a/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h b/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h index 4d883ee9be..74ae9dbc1d 100644 --- a/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h +++ b/contrib/IECoreAlembic/include/IECoreAlembic/TypeIds.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREALEMBIC_TYPEIDS_H -#define IECOREALEMBIC_TYPEIDS_H +#pragma once namespace IECoreAlembic { @@ -46,4 +45,3 @@ enum TypeId } // namespace IECoreAlembic -#endif // IECOREALEMBIC_TYPEIDS_H diff --git a/contrib/IECoreUSD/include/IECoreUSD/AttributeAlgo.h b/contrib/IECoreUSD/include/IECoreUSD/AttributeAlgo.h index fb74a9beea..91f19f172a 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/AttributeAlgo.h +++ b/contrib/IECoreUSD/include/IECoreUSD/AttributeAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_ATTRIBUTEALGO_H -#define IECOREUSD_ATTRIBUTEALGO_H +#pragma once #include "IECoreUSD/Export.h" @@ -85,4 +84,3 @@ IECOREUSD_API pxr::TfToken cortexPrimitiveVariableMetadataTokenDeprecated(); } // namespace IECoreUSD -#endif // IECOREUSD_ATTRIBUTEALGO_H diff --git a/contrib/IECoreUSD/include/IECoreUSD/DataAlgo.h b/contrib/IECoreUSD/include/IECoreUSD/DataAlgo.h index 1e6c8bd611..f95d7a4d35 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/DataAlgo.h +++ b/contrib/IECoreUSD/include/IECoreUSD/DataAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_DATAALGO_H -#define IECOREUSD_DATAALGO_H +#pragma once #include "IECoreUSD/Export.h" #include "IECoreUSD/TypeTraits.h" @@ -108,4 +107,3 @@ IECOREUSD_API pxr::TfToken role( IECore::GeometricData::Interpretation interpret #include "IECoreUSD/DataAlgo.inl" -#endif // IECOREUSD_DATAALGO_H diff --git a/contrib/IECoreUSD/include/IECoreUSD/DataAlgo.inl b/contrib/IECoreUSD/include/IECoreUSD/DataAlgo.inl index 05a05bdb90..16d54df5de 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/DataAlgo.inl +++ b/contrib/IECoreUSD/include/IECoreUSD/DataAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_DATAALGO_INL -#define IECOREUSD_DATAALGO_INL +#pragma once IECORE_PUSH_DEFAULT_VISIBILITY #include "pxr/base/gf/quatf.h" @@ -156,5 +155,3 @@ typename CortexTypeTraits::USDType toUSD( const T &value, typename std::enabl } // namespace DataAlgo } // namespace IECoreUSD - -#endif // IECOREUSD_DATAALGO_INL diff --git a/contrib/IECoreUSD/include/IECoreUSD/Export.h b/contrib/IECoreUSD/include/IECoreUSD/Export.h index 33c316565a..0b7eb95111 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/Export.h +++ b/contrib/IECoreUSD/include/IECoreUSD/Export.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_EXPORT_H -#define IECOREUSD_EXPORT_H +#pragma once #include "IECore/Export.h" @@ -42,5 +41,3 @@ #else #define IECOREUSD_API IECORE_IMPORT #endif - -#endif // #ifndef IECOREUSD_EXPORT_H diff --git a/contrib/IECoreUSD/include/IECoreUSD/ObjectAlgo.h b/contrib/IECoreUSD/include/IECoreUSD/ObjectAlgo.h index fb73713fad..1b35725077 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/ObjectAlgo.h +++ b/contrib/IECoreUSD/include/IECoreUSD/ObjectAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_OBJECTALGO_H -#define IECOREUSD_OBJECTALGO_H +#pragma once #include "IECoreUSD/Export.h" @@ -132,4 +131,3 @@ struct WriterDescription } // namespace IECoreUSD -#endif // IECOREUSD_OBJECTALGO_H diff --git a/contrib/IECoreUSD/include/IECoreUSD/PrimitiveAlgo.h b/contrib/IECoreUSD/include/IECoreUSD/PrimitiveAlgo.h index 1ef5ab0830..f989ded6d3 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/PrimitiveAlgo.h +++ b/contrib/IECoreUSD/include/IECoreUSD/PrimitiveAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_PRIMITIVEALGO_H -#define IECOREUSD_PRIMITIVEALGO_H +#pragma once #include "IECoreUSD/Export.h" @@ -89,4 +88,3 @@ IECOREUSD_API IECoreScene::PrimitiveVariable::Interpolation fromUSD( pxr::TfToke } // namespace IECoreUSD -#endif // IECOREUSD_PRIMITIVEALGO_H diff --git a/contrib/IECoreUSD/include/IECoreUSD/SceneCacheDataAlgo.h b/contrib/IECoreUSD/include/IECoreUSD/SceneCacheDataAlgo.h index c1d6e4929e..d9de0e302e 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/SceneCacheDataAlgo.h +++ b/contrib/IECoreUSD/include/IECoreUSD/SceneCacheDataAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_SCENECACHEDATAALGO_H -#define IECOREUSD_SCENECACHEDATAALGO_H +#pragma once #include "IECoreUSD/Export.h" @@ -65,4 +64,3 @@ IECOREUSD_API std::string toInternalName( const IECore::InternedString& name ); } // namespace IECoreUSD -#endif // IECOREUSD_SCENECACHEDATAALGO_H diff --git a/contrib/IECoreUSD/include/IECoreUSD/ShaderAlgo.h b/contrib/IECoreUSD/include/IECoreUSD/ShaderAlgo.h index 892b8e1038..73832630f4 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/ShaderAlgo.h +++ b/contrib/IECoreUSD/include/IECoreUSD/ShaderAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_SHADERALGO_H -#define IECOREUSD_SHADERALGO_H +#pragma once #include "IECoreUSD/Export.h" @@ -72,4 +71,3 @@ IECOREUSD_API bool lightMightBeTimeVarying( const pxr::UsdLuxLightAPI &light ); } // namespace IECoreUSD -#endif // IECOREUSD_SHADERALGO_H diff --git a/contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h b/contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h index b3f6ac609c..c67ab3922e 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h +++ b/contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_TYPETRAITS_H -#define IECOREUSD_TYPETRAITS_H +#pragma once #include "IECore/GeometricTypedData.h" #include "IECore/InternedString.h" @@ -125,4 +124,3 @@ IECOREUSD_USDTYPETRAITS_SPECIALISATION( Imath::Quatf, pxr::GfQuath, false, IECor } // namespace IECoreUSD -#endif // IECOREUSD_TYPETRAITS_H diff --git a/contrib/IECoreUSD/src/IECoreUSD/SceneCacheData.h b/contrib/IECoreUSD/src/IECoreUSD/SceneCacheData.h index 4c991dae46..1c3dbf1e32 100644 --- a/contrib/IECoreUSD/src/IECoreUSD/SceneCacheData.h +++ b/contrib/IECoreUSD/src/IECoreUSD/SceneCacheData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_SCENE_CACHE_DATA_H -#define IECOREUSD_SCENE_CACHE_DATA_H +#pragma once #include "IECoreScene/SceneInterface.h" #include "IECoreScene/SharedSceneInterfaces.h" @@ -188,5 +187,4 @@ class SceneCacheData : public SdfAbstractData PXR_NAMESPACE_CLOSE_SCOPE -#endif // IECOREUSD_SCENE_CACHE_DATA_H diff --git a/contrib/IECoreUSD/src/IECoreUSD/SceneCacheFileFormat.h b/contrib/IECoreUSD/src/IECoreUSD/SceneCacheFileFormat.h index 4a5cdb8a38..da003a2f45 100644 --- a/contrib/IECoreUSD/src/IECoreUSD/SceneCacheFileFormat.h +++ b/contrib/IECoreUSD/src/IECoreUSD/SceneCacheFileFormat.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_SCENECACHEFILEFORMAT_H -#define IECOREUSD_SCENECACHEFILEFORMAT_H +#pragma once #include "USDScene.h" @@ -113,5 +112,4 @@ class UsdSceneCacheFileFormat : public SdfFileFormat }; PXR_NAMESPACE_CLOSE_SCOPE -#endif // IECOREUSD_SCENECACHEFILEFORMAT_H diff --git a/contrib/IECoreUSD/src/IECoreUSD/SdfFileFormatSharedSceneWriters.h b/contrib/IECoreUSD/src/IECoreUSD/SdfFileFormatSharedSceneWriters.h index 4bff48eb57..d27501a486 100644 --- a/contrib/IECoreUSD/src/IECoreUSD/SdfFileFormatSharedSceneWriters.h +++ b/contrib/IECoreUSD/src/IECoreUSD/SdfFileFormatSharedSceneWriters.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_SDFFILEFORMATSHAREDSCENEWRITERS_H -#define IECOREUSD_SDFFILEFORMATSHAREDSCENEWRITERS_H +#pragma once #include "IECoreScene/SceneInterface.h" @@ -69,5 +68,4 @@ class SdfFileFormatSharedSceneWriters } // namespace IECoreUSD -#endif // IECOREUSD_SDFFILEFORMATSHAREDSCENEWRITERS_H diff --git a/contrib/IECoreUSD/src/IECoreUSD/TypeIds.h b/contrib/IECoreUSD/src/IECoreUSD/TypeIds.h index e147ef62dc..a2113d5216 100644 --- a/contrib/IECoreUSD/src/IECoreUSD/TypeIds.h +++ b/contrib/IECoreUSD/src/IECoreUSD/TypeIds.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_TYPEIDS_H -#define IECOREUSD_TYPEIDS_H +#pragma once namespace IECoreUSD { @@ -46,4 +45,3 @@ enum TypeId } // namespace IECoreUSD -#endif // IECOREUSD_TYPEIDS_H \ No newline at end of file diff --git a/contrib/IECoreUSD/src/IECoreUSD/USDScene.h b/contrib/IECoreUSD/src/IECoreUSD/USDScene.h index cee778e1ec..4a499220c1 100644 --- a/contrib/IECoreUSD/src/IECoreUSD/USDScene.h +++ b/contrib/IECoreUSD/src/IECoreUSD/USDScene.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREUSD_USDSCENE_H -#define IECOREUSD_USDSCENE_H +#pragma once #include "TypeIds.h" @@ -133,4 +132,3 @@ IE_CORE_DECLAREPTR( USDScene ) } -#endif // IECOREUSD_USDSCENE_H diff --git a/glsl/IECoreGL/ColorAlgo.h b/glsl/IECoreGL/ColorAlgo.h index f35fea42ce..f73a644034 100644 --- a/glsl/IECoreGL/ColorAlgo.h +++ b/glsl/IECoreGL/ColorAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_COLORALGO_H -#define IECOREGL_COLORALGO_H +#pragma once float ieLuminance( vec3 color, vec3 weights ) { @@ -164,4 +163,3 @@ vec3 ieRgbToHSV( vec3 rgb ) return result; } -#endif // IECOREGL_COLORALGO_H diff --git a/glsl/IECoreGL/CurvesPrimitive.h b/glsl/IECoreGL/CurvesPrimitive.h index ea65877be1..b0c0b98d44 100644 --- a/glsl/IECoreGL/CurvesPrimitive.h +++ b/glsl/IECoreGL/CurvesPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_CURVESPRIMITIVE_H -#define IECOREGL_CURVESPRIMITIVE_H +#pragma once #include "IECoreGL/VecAlgo.h" @@ -96,7 +95,7 @@ vec4 ieCurvesPrimitiveCoefficients( in mat4x4 basis, in float t ) float t2 = t * t; float t3 = t2 * t; - return vec4( + return vec4( basis[0][0] * t3 + basis[1][0] * t2 + basis[2][0] * t + basis[3][0], basis[0][1] * t3 + basis[1][1] * t2 + basis[2][1] * t + basis[3][1], basis[0][2] * t3 + basis[1][2] * t2 + basis[2][2] * t + basis[3][2], @@ -188,4 +187,3 @@ void ieCurvesPrimitiveCubicFrame( ieCurvesPrimitiveUTangentAndNormal( p, vTangent, uTangent, n ); } -#endif // IECOREGL_CURVESPRIMITIVE_H diff --git a/glsl/IECoreGL/Diffuse.h b/glsl/IECoreGL/Diffuse.h index 0028f418f8..a02968faec 100644 --- a/glsl/IECoreGL/Diffuse.h +++ b/glsl/IECoreGL/Diffuse.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_DIFFUSE_H -#define IECOREGL_DIFFUSE_H +#pragma once #define M_PI 3.1415926535897932384626433832795 @@ -48,4 +47,3 @@ vec3 ieDiffuse( vec3 P, vec3 N, vec3 Cl[gl_MaxLights], vec3 L[gl_MaxLights], int return result; } -#endif // IECOREGL_DIFFUSE_H diff --git a/glsl/IECoreGL/FilterAlgo.h b/glsl/IECoreGL/FilterAlgo.h index 6593a163d4..a5bd6c95d3 100644 --- a/glsl/IECoreGL/FilterAlgo.h +++ b/glsl/IECoreGL/FilterAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_FILTERALGO_H -#define IECOREGL_FILTERALGO_H +#pragma once float ieFilteredStep( float edge, float x, float w ) { @@ -57,4 +56,3 @@ float ieFilteredPulse( float edge0, float edge1, float x ) return ieFilteredPulse( edge0, edge1, x, max( 1.0e-6, fwidth( x ) ) ); } -#endif // IECOREGL_FILTERALGO_H diff --git a/glsl/IECoreGL/FragmentShader.h b/glsl/IECoreGL/FragmentShader.h index c3b583e617..12f7cf763a 100644 --- a/glsl/IECoreGL/FragmentShader.h +++ b/glsl/IECoreGL/FragmentShader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_FRAGMENTSHADER_H -#define IECOREGL_FRAGMENTSHADER_H +#pragma once #if __VERSION__ <= 120 #define IECOREGL_FRAGMENTSHADER_IN varying @@ -41,4 +40,3 @@ #define IECOREGL_FRAGMENTSHADER_IN in #endif -#endif // IECOREGL_FRAGMENTSHADER_H diff --git a/glsl/IECoreGL/Light.h b/glsl/IECoreGL/Light.h index 019fd48bfd..b6f0112d31 100644 --- a/glsl/IECoreGL/Light.h +++ b/glsl/IECoreGL/Light.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_LIGHT_H -#define IECOREGL_LIGHT_H +#pragma once vec3 ieLight( vec3 p, int lightIndex, out vec3 L ) { @@ -77,4 +76,3 @@ vec3 ieLight( vec3 p, int lightIndex, out vec3 L ) } -#endif // IECOREGL_LIGHT_H diff --git a/glsl/IECoreGL/Lights.h b/glsl/IECoreGL/Lights.h index 5e345b409f..d8db7de9e2 100644 --- a/glsl/IECoreGL/Lights.h +++ b/glsl/IECoreGL/Lights.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_LIGHTS_H -#define IECOREGL_LIGHTS_H +#pragma once #include "IECoreGL/Light.h" @@ -45,4 +44,3 @@ void lights( vec3 p, out vec3 Cl[gl_MaxLights], out vec3 L[gl_MaxLights], int n } } -#endif // IECOREGL_LIGHTS_H diff --git a/glsl/IECoreGL/MatrixAlgo.h b/glsl/IECoreGL/MatrixAlgo.h index 45850f0e18..ca45014e78 100644 --- a/glsl/IECoreGL/MatrixAlgo.h +++ b/glsl/IECoreGL/MatrixAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_MATRIXALGO_H -#define IECOREGL_MATRIXALGO_H +#pragma once mat4 ieMatrixFromBasis( in vec3 x, in vec3 y, in vec3 z, in vec3 o ) { @@ -57,4 +56,3 @@ mat4 ieMatrixFromBasis( in vec3 x, in vec3 y, in vec3 z, in vec3 o ) return result; } -#endif // IECOREGL_MATRIXALGO_H diff --git a/glsl/IECoreGL/PointsPrimitive.h b/glsl/IECoreGL/PointsPrimitive.h index 6e55c360a1..1f982a5953 100644 --- a/glsl/IECoreGL/PointsPrimitive.h +++ b/glsl/IECoreGL/PointsPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_POINTSPRIMITIVE_H -#define IECOREGL_POINTSPRIMITIVE_H +#pragma once #include "IECoreGL/MatrixAlgo.h" #include "IECoreGL/VertexShader.h" @@ -84,4 +83,3 @@ mat4 iePointsPrimitiveInstanceMatrix( in vec3 P, in float width, in float aspect return placementMatrix; } -#endif // IECOREGL_POINTSPRIMITIVE_H diff --git a/glsl/IECoreGL/Specular.h b/glsl/IECoreGL/Specular.h index 205da722b4..73819ca244 100644 --- a/glsl/IECoreGL/Specular.h +++ b/glsl/IECoreGL/Specular.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SPECULAR_H -#define IECOREGL_SPECULAR_H +#pragma once #define M_PI 3.1415926535897932384626433832795 @@ -72,4 +71,3 @@ vec3 ieSpecular( vec3 P, vec3 N, vec3 V, float roughness, vec3 lightColors[gl_Ma return result; } -#endif // IECOREGL_SPECULAR_H diff --git a/glsl/IECoreGL/VecAlgo.h b/glsl/IECoreGL/VecAlgo.h index c3dbc88042..528137e092 100644 --- a/glsl/IECoreGL/VecAlgo.h +++ b/glsl/IECoreGL/VecAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_VECALGO_H -#define IECOREGL_VECALGO_H +#pragma once /// Same as Imath::Vec::normalize(), in that it just returns the input /// if it has zero length (rather than dividing by zero). @@ -63,4 +62,3 @@ vec3 ieNormalize( in vec3 v ) } } -#endif // IECOREGL_VECALGO_H diff --git a/glsl/IECoreGL/VertexShader.h b/glsl/IECoreGL/VertexShader.h index 8e095bed28..50d5c7fe3e 100644 --- a/glsl/IECoreGL/VertexShader.h +++ b/glsl/IECoreGL/VertexShader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_VERTEXSHADER_H -#define IECOREGL_VERTEXSHADER_H +#pragma once #if __VERSION__ <= 120 #define IECOREGL_VERTEXSHADER_IN attribute @@ -43,4 +42,3 @@ #define IECOREGL_VERTEXSHADER_OUT out #endif -#endif // IECOREGL_VERTEXSHADER_H diff --git a/include/IECore/AngleConversion.h b/include/IECore/AngleConversion.h index f388e776f2..fbeda55588 100644 --- a/include/IECore/AngleConversion.h +++ b/include/IECore/AngleConversion.h @@ -36,8 +36,7 @@ /// Defines templates conversions between radians and degrees /// \ingroup mathGroup -#ifndef IE_CORE_ANGLECONVERSION_H -#define IE_CORE_ANGLECONVERSION_H +#pragma once #include "IECore/Math.h" @@ -58,4 +57,3 @@ inline T radiansToDegrees( const T &value ) } // namespace IECore -#endif // IE_CORE_ANGLECONVERSION_H diff --git a/include/IECore/BezierAlgo.h b/include/IECore/BezierAlgo.h index 5210abf8e9..c554194e59 100644 --- a/include/IECore/BezierAlgo.h +++ b/include/IECore/BezierAlgo.h @@ -36,8 +36,7 @@ /// Defines algorithms for bezier curves. /// \ingroup mathGroup -#ifndef IECORE_BEZIERALGO_H -#define IECORE_BEZIERALGO_H +#pragma once namespace IECore { @@ -56,4 +55,3 @@ void bezierSubdivide( const Vec &v0, const Vec &v1, const Vec &v2, typename Vec: #include "IECore/BezierAlgo.inl" -#endif // IECORE_BEZIERALGO_H diff --git a/include/IECore/BezierAlgo.inl b/include/IECore/BezierAlgo.inl index 6ed008873e..3238fb9723 100644 --- a/include/IECore/BezierAlgo.inl +++ b/include/IECore/BezierAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_BEZIERALGO_INL -#define IECORE_BEZIERALGO_INL +#pragma once #include "IECore/LineSegment.h" @@ -103,5 +102,3 @@ void bezierSubdivide( const Vec &v0, const Vec &v1, const Vec &v2, typename Vec: } } // namespace IECore - -#endif // IECORE_BEZIERALGO_INL diff --git a/include/IECore/BinaryFrameList.h b/include/IECore/BinaryFrameList.h index 46f1740f3b..0cd1fe63f3 100644 --- a/include/IECore/BinaryFrameList.h +++ b/include/IECore/BinaryFrameList.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_BINARYFRAMELIST_H -#define IE_CORE_BINARYFRAMELIST_H +#pragma once #include "IECore/Export.h" #include "IECore/ReorderedFrameList.h" @@ -74,4 +73,3 @@ IE_CORE_DECLAREPTR( BinaryFrameList ); } // namespace IECore -#endif // IE_CORE_BINARYFRAMELIST_H diff --git a/include/IECore/BlindDataHolder.h b/include/IECore/BlindDataHolder.h index 857f9eb45a..d6186d2011 100644 --- a/include/IECore/BlindDataHolder.h +++ b/include/IECore/BlindDataHolder.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_BLINDDATAHOLDER_H -#define IE_CORE_BLINDDATAHOLDER_H +#pragma once #include "IECore/CompoundData.h" #include "IECore/Export.h" @@ -71,4 +70,3 @@ IE_CORE_DECLAREPTR( BlindDataHolder ) } -#endif // IE_CORE_BLINDDATAHOLDER_H diff --git a/include/IECore/BoundedKDTree.h b/include/IECore/BoundedKDTree.h index f7ab3bbe38..550c039a6c 100644 --- a/include/IECore/BoundedKDTree.h +++ b/include/IECore/BoundedKDTree.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_BOUNDEDKDTREE_H -#define IE_CORE_BOUNDEDKDTREE_H +#pragma once #include "IECore/BoxTraits.h" #include "IECore/Export.h" @@ -172,4 +171,3 @@ typedef BoundedKDTree::const_iterator> Box3dTree; #include "BoundedKDTree.inl" -#endif // IE_CORE_BOUNDEDKDTREE_H diff --git a/include/IECore/BoundedKDTree.inl b/include/IECore/BoundedKDTree.inl index 3ac200cc8d..a1ec38d465 100644 --- a/include/IECore/BoundedKDTree.inl +++ b/include/IECore/BoundedKDTree.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/BoxOps.h" #include "IECore/VectorOps.h" #include "IECore/VectorTraits.h" diff --git a/include/IECore/BoxAlgo.h b/include/IECore/BoxAlgo.h index dee3d70aaf..a8a137a3ad 100644 --- a/include/IECore/BoxAlgo.h +++ b/include/IECore/BoxAlgo.h @@ -36,8 +36,7 @@ /// Defines algorithms and operators which ideally would be already defined in ImathBox.h /// \ingroup mathGroup -#ifndef IE_CORE_BOXALGO_H -#define IE_CORE_BOXALGO_H +#pragma once #include "IECore/Export.h" @@ -79,4 +78,3 @@ void split( const Imath::Box &box, Imath::Box &low, Imath::Box &high ); #include "IECore/BoxAlgo.inl" -#endif // IE_CORE_BOXALGO_H diff --git a/include/IECore/BoxAlgo.inl b/include/IECore/BoxAlgo.inl index cfaa634a0e..db291ccf8d 100644 --- a/include/IECore/BoxAlgo.inl +++ b/include/IECore/BoxAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_BOXALGO_INL -#define IE_CORE_BOXALGO_INL +#pragma once namespace IECore { @@ -128,5 +127,3 @@ void split( const Imath::Box &box, Imath::Box &low, Imath::Box &high ) } // namespace BoxAlgo } // namespace IECore - -#endif // IE_CORE_BOXALGO_INL diff --git a/include/IECore/BoxInterpolator.inl b/include/IECore/BoxInterpolator.inl index ec194d9011..f13b8b3f0f 100644 --- a/include/IECore/BoxInterpolator.inl +++ b/include/IECore/BoxInterpolator.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY diff --git a/include/IECore/BoxOps.h b/include/IECore/BoxOps.h index 330ebd1579..65ba9afc14 100644 --- a/include/IECore/BoxOps.h +++ b/include/IECore/BoxOps.h @@ -41,8 +41,7 @@ /// give less intuitive syntax but are compatible with any classes for which /// a valid BoxTraits specialisation exists. -#ifndef IE_CORE_BOXOPS_H -#define IE_CORE_BOXOPS_H +#pragma once #include "IECore/BoxTraits.h" #include "IECore/VectorTraits.h" @@ -108,4 +107,3 @@ int boxMajorAxis( const T &box ); #include "IECore/BoxOps.inl" -#endif // IE_CORE_BOXOPS_H diff --git a/include/IECore/BoxOps.inl b/include/IECore/BoxOps.inl index 9171bb6cff..55c2b36e06 100644 --- a/include/IECore/BoxOps.inl +++ b/include/IECore/BoxOps.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_BOXOPS_INL -#define IE_CORE_BOXOPS_INL +#pragma once #include "IECore/VectorOps.h" @@ -371,6 +370,3 @@ int boxMajorAxis( const T &box ) } // namespace IECore - -#endif // IE_CORE_BOXOPS_INL - diff --git a/include/IECore/BoxTraits.h b/include/IECore/BoxTraits.h index a44cf0cd1d..44e319c28c 100644 --- a/include/IECore/BoxTraits.h +++ b/include/IECore/BoxTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_BOXTRAITS_H -#define IE_CORE_BOXTRAITS_H +#pragma once #include "IECore/Export.h" #include "IECore/VectorTraits.h" @@ -172,4 +171,3 @@ struct BoxTypeTraits } // namespace IECore -#endif // IE_CORE_BOXTRAITS_H diff --git a/include/IECore/ByteOrder.h b/include/IECore/ByteOrder.h index 858a8a28c5..721c207b19 100644 --- a/include/IECore/ByteOrder.h +++ b/include/IECore/ByteOrder.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_BYTEORDER_H -#define IE_CORE_BYTEORDER_H +#pragma once #include @@ -192,4 +191,3 @@ inline T asBigEndian( const T &x ) } -#endif // IE_CORE_BYTEORDER_H diff --git a/include/IECore/CachedReader.h b/include/IECore/CachedReader.h index 6bb8995998..4869e8560f 100644 --- a/include/IECore/CachedReader.h +++ b/include/IECore/CachedReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_CACHEDREADER_H -#define IE_CORE_CACHEDREADER_H +#pragma once #include "IECore/Export.h" #include "IECore/ModifyOp.h" @@ -132,4 +131,3 @@ IE_CORE_DECLAREPTR( CachedReader ) } // namespace IECore -#endif // IE_CORE_CACHEDREADER_H diff --git a/include/IECore/CamelCase.h b/include/IECore/CamelCase.h index 4dad4b9078..c69f775bdf 100644 --- a/include/IECore/CamelCase.h +++ b/include/IECore/CamelCase.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CAMELCASE_H -#define IECORE_CAMELCASE_H +#pragma once #include "IECore/Export.h" @@ -72,4 +71,3 @@ class IECORE_API CamelCase #include "IECore/CamelCase.inl" -#endif // IECORE_CAMELCASE_H diff --git a/include/IECore/CamelCase.inl b/include/IECore/CamelCase.inl index 7fdd35db71..6f5ba7ba47 100644 --- a/include/IECore/CamelCase.inl +++ b/include/IECore/CamelCase.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CAMELCASE_INL -#define IECORE_CAMELCASE_INL +#pragma once #include "IECore/StringAlgo.h" @@ -157,5 +156,3 @@ std::string CamelCase::join( Iterator begin, Iterator end, Caps caps, const std: } } // namespace IECore - -#endif // IECORE_CAMELCASE_INL diff --git a/include/IECore/Canceller.h b/include/IECore/Canceller.h index 10863a342d..5b1b532084 100644 --- a/include/IECore/Canceller.h +++ b/include/IECore/Canceller.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CANCELLER_H -#define IECORE_CANCELLER_H +#pragma once #include "IECore/RefCounted.h" @@ -137,4 +136,3 @@ IE_CORE_DECLAREPTR( Canceller ) #include "IECore/Canceller.inl" -#endif // IECORE_CANCELLER_H diff --git a/include/IECore/Canceller.inl b/include/IECore/Canceller.inl index ddde11169e..2fd4e992ad 100644 --- a/include/IECore/Canceller.inl +++ b/include/IECore/Canceller.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CANCELLER_INL -#define IECORE_CANCELLER_INL +#pragma once namespace IECore { @@ -126,5 +125,3 @@ inline Canceller::ScopedChild::~ScopedChild() } }; // namespace IECore - -#endif // IECORE_CANCELLER_INL diff --git a/include/IECore/CircularIterator.h b/include/IECore/CircularIterator.h index 4f8e4a4a13..b0bb257e31 100644 --- a/include/IECore/CircularIterator.h +++ b/include/IECore/CircularIterator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CIRCULARITERATOR_H -#define IECORE_CIRCULARITERATOR_H +#pragma once namespace IECore { @@ -105,4 +104,3 @@ class CircularIterator #include "IECore/CircularIterator.inl" -#endif // IECORE_CIRCULARITERATOR_H diff --git a/include/IECore/CircularIterator.inl b/include/IECore/CircularIterator.inl index a19f704e57..c00698e367 100644 --- a/include/IECore/CircularIterator.inl +++ b/include/IECore/CircularIterator.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CIRCULARITERATOR_INL -#define IECORE_CIRCULARITERATOR_INL +#pragma once namespace IECore { @@ -189,5 +188,3 @@ typename CircularIterator::BaseIterator CircularIterator @@ -117,5 +116,3 @@ void ClassData::erase( const ClassType *c } - -#endif diff --git a/include/IECore/CompoundData.h b/include/IECore/CompoundData.h index 786339de0b..6234d34779 100644 --- a/include/IECore/CompoundData.h +++ b/include/IECore/CompoundData.h @@ -33,8 +33,7 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_COMPOUNDDATA_H -#define IECORE_COMPOUNDDATA_H +#pragma once #include "IECore/CompoundDataBase.h" #include "IECore/Export.h" @@ -77,4 +76,3 @@ IE_CORE_DECLAREPTR( CompoundData ); #include "IECore/CompoundData.inl" -#endif // IE_CORE_COMPOUNDDATA_H diff --git a/include/IECore/CompoundData.inl b/include/IECore/CompoundData.inl index ca07a1a2a4..861c205b92 100644 --- a/include/IECore/CompoundData.inl +++ b/include/IECore/CompoundData.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_COMPOUNDDATA_INL -#define IECORE_COMPOUNDDATA_INL +#pragma once #include "IECore/Exception.h" @@ -132,5 +131,3 @@ T *CompoundData::member( const InternedString &name, bool throwExceptions, bool }; // namespace IECore - -#endif // IECORE_COMPOUNDDATA_INL diff --git a/include/IECore/CompoundDataBase.h b/include/IECore/CompoundDataBase.h index 7cac4537d5..549b38a0d8 100644 --- a/include/IECore/CompoundDataBase.h +++ b/include/IECore/CompoundDataBase.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_COMPOUNDDATABASE_H -#define IECORE_COMPOUNDDATABASE_H +#pragma once #include "IECore/TypedData.h" @@ -53,4 +52,3 @@ IECORE_DECLARE_TYPEDDATA( CompoundDataBase, CompoundDataMap, void, SimpleDataHol } // namespace IECore -#endif // IECORE_COMPOUNDDATABASE_H diff --git a/include/IECore/CompoundDataConversion.h b/include/IECore/CompoundDataConversion.h index df8a52e009..5f3e2b8c00 100644 --- a/include/IECore/CompoundDataConversion.h +++ b/include/IECore/CompoundDataConversion.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_COMPOUNDDATACONVERSION_H -#define IE_CORE_COMPOUNDDATACONVERSION_H +#pragma once #include "IECore/DataConversion.h" @@ -76,4 +75,3 @@ class CompoundDataConversion : public DataConversion< typename C1::FromType, typ #include "CompoundDataConversion.inl" -#endif // IE_CORE_COMPOUNDDATACONVERSION_H diff --git a/include/IECore/CompoundDataConversion.inl b/include/IECore/CompoundDataConversion.inl index 4e9729ab65..f308e7475d 100644 --- a/include/IECore/CompoundDataConversion.inl +++ b/include/IECore/CompoundDataConversion.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_COMPOUNDDATACONVERSION_INL -#define IE_CORE_COMPOUNDDATACONVERSION_INL +#pragma once namespace IECore { @@ -61,5 +60,3 @@ typename CompoundDataConversion::InverseType CompoundDataConversion::objectPool() const } } // namespace IECore - -#endif // IECORE_COMPUTATIONCACHE_H - diff --git a/include/IECore/Convert.h b/include/IECore/Convert.h index a6f5a5e223..eb79dc0a59 100644 --- a/include/IECore/Convert.h +++ b/include/IECore/Convert.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CONVERT_H -#define IECORE_CONVERT_H +#pragma once namespace IECore { @@ -51,4 +50,3 @@ T convert( const F &from ) } // namespace IECore -#endif // IECORE_CONVERT_H diff --git a/include/IECore/Converter.h b/include/IECore/Converter.h index e4be7d30ec..950da23cbc 100644 --- a/include/IECore/Converter.h +++ b/include/IECore/Converter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CONVERTER_H -#define IECORE_CONVERTER_H +#pragma once #include "IECore/Export.h" #include "IECore/Parameterised.h" @@ -67,4 +66,3 @@ IE_CORE_DECLAREPTR( Converter ); } // namespace IECore -#endif // IECORE_CONVERTER_H diff --git a/include/IECore/CubicBasis.h b/include/IECore/CubicBasis.h index be71c6ddba..e16748d509 100644 --- a/include/IECore/CubicBasis.h +++ b/include/IECore/CubicBasis.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CUBICBASIS_H -#define IECORE_CUBICBASIS_H +#pragma once #include "IECore/Export.h" @@ -155,4 +154,3 @@ typedef CubicBasis CubicBasisd; #include "IECore/CubicBasis.inl" -#endif // IECORE_CUBICBASIS_H diff --git a/include/IECore/CubicBasis.inl b/include/IECore/CubicBasis.inl index 5dffbc1903..5027470f0c 100644 --- a/include/IECore/CubicBasis.inl +++ b/include/IECore/CubicBasis.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_CUBICBASIS_INL -#define IECORE_CUBICBASIS_INL +#pragma once #include "IECore/CubicBasis.h" #include "IECore/Exception.h" @@ -399,5 +398,3 @@ StandardCubicBasis CubicBasis::standardBasis() const } // namespace IECore - -#endif // IECORE_CUBICBASIS_INL diff --git a/include/IECore/Data.h b/include/IECore/Data.h index 9fc00b51e1..b52f5bd25f 100644 --- a/include/IECore/Data.h +++ b/include/IECore/Data.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DATA_H -#define IE_CORE_DATA_H +#pragma once #include "IECore/Export.h" #include "IECore/Object.h" @@ -63,4 +62,3 @@ IE_CORE_DECLAREPTR( Data ); } // namespace IECore -#endif // IE_CORE_DATA_H diff --git a/include/IECore/DataAlgo.h b/include/IECore/DataAlgo.h index 8d5ca21839..55fa84c49d 100644 --- a/include/IECore/DataAlgo.h +++ b/include/IECore/DataAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_DATAALGO_H -#define IECORE_DATAALGO_H +#pragma once #include "IECore/Data.h" #include "IECore/GeometricTypedData.h" @@ -108,4 +107,3 @@ typename std::invoke_result_t dispatch( const Data * #include "IECore/DataAlgo.inl" -#endif // IECORE_DATAALGO_H diff --git a/include/IECore/DataAlgo.inl b/include/IECore/DataAlgo.inl index c3fb36f17c..7cf1d5a1d6 100644 --- a/include/IECore/DataAlgo.inl +++ b/include/IECore/DataAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_DATAALGO_INL -#define IECORE_DATAALGO_INL +#pragma once #include "IECore/DateTimeData.h" #include "IECore/PathMatcherData.h" @@ -399,5 +398,3 @@ bool trait( const IECore::Data *data ) } } // namespace IECore - -#endif // IECORE_DATAALGO_INL diff --git a/include/IECore/DataCastOp.h b/include/IECore/DataCastOp.h index 89df343f25..5e6ec8f0fc 100644 --- a/include/IECore/DataCastOp.h +++ b/include/IECore/DataCastOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DATACASTOP_H -#define IE_CORE_DATACASTOP_H +#pragma once #include "IECore/Export.h" #include "IECore/NumericParameter.h" @@ -75,4 +74,3 @@ IE_CORE_DECLAREPTR( DataCastOp ); } // namespace IECore -#endif // IE_CORE_DATACASTOP_H diff --git a/include/IECore/DataConversion.h b/include/IECore/DataConversion.h index 141c61abab..cc784651f7 100644 --- a/include/IECore/DataConversion.h +++ b/include/IECore/DataConversion.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DATACONVERSION_H -#define IE_CORE_DATACONVERSION_H +#pragma once #include "boost/type_traits/integral_constant.hpp" @@ -73,4 +72,3 @@ struct DataConversion } // namespace IECore -#endif // IE_CORE_DATACONVERSION_H diff --git a/include/IECore/DataConvert.h b/include/IECore/DataConvert.h index 99951f3b1f..3aec5c4d3c 100644 --- a/include/IECore/DataConvert.h +++ b/include/IECore/DataConvert.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DATACONVERT_H -#define IE_CORE_DATACONVERT_H +#pragma once #include "IECore/TypeTraits.h" @@ -68,4 +67,3 @@ struct DataConvert #include "DataConvert.inl" -#endif // IE_CORE_DATACONVERT_H diff --git a/include/IECore/DataConvert.inl b/include/IECore/DataConvert.inl index c9365da70b..5df280008a 100644 --- a/include/IECore/DataConvert.inl +++ b/include/IECore/DataConvert.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "boost/mpl/and.hpp" #include "boost/mpl/not.hpp" #include "boost/utility/enable_if.hpp" diff --git a/include/IECore/DataConvertOp.h b/include/IECore/DataConvertOp.h index 7f797ee95c..3431776b56 100644 --- a/include/IECore/DataConvertOp.h +++ b/include/IECore/DataConvertOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_DATACONVERTOP_H -#define IECORE_DATACONVERTOP_H +#pragma once #include "IECore/Export.h" #include "IECore/NumericParameter.h" @@ -88,4 +87,3 @@ IE_CORE_DECLAREPTR( DataConvertOp ); } // namespace IECore -#endif // IECORE_DATACONVERTOP_H diff --git a/include/IECore/DataInterleaveOp.h b/include/IECore/DataInterleaveOp.h index ccd5821c5c..08b6ea22aa 100644 --- a/include/IECore/DataInterleaveOp.h +++ b/include/IECore/DataInterleaveOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_DATAINTERLEAVEOP_H -#define IECORE_DATAINTERLEAVEOP_H +#pragma once #include "IECore/Export.h" #include "IECore/NumericParameter.h" @@ -85,4 +84,3 @@ IE_CORE_DECLAREPTR( DataInterleaveOp ); } // namespace IECore -#endif // IECORE_DATAINTERLEAVEOP_H diff --git a/include/IECore/DataPromoteOp.h b/include/IECore/DataPromoteOp.h index 78a2f88f94..60c704a1e9 100644 --- a/include/IECore/DataPromoteOp.h +++ b/include/IECore/DataPromoteOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DATAPROMOTEOP_H -#define IE_CORE_DATAPROMOTEOP_H +#pragma once #include "IECore/Export.h" #include "IECore/NumericParameter.h" @@ -82,4 +81,3 @@ IE_CORE_DECLAREPTR( DataPromoteOp ); } // namespace IECore -#endif // IE_CORE_DATAPROMOTEOP_H diff --git a/include/IECore/DateTimeData.h b/include/IECore/DateTimeData.h index ce6bb55f2c..0142349ada 100644 --- a/include/IECore/DateTimeData.h +++ b/include/IECore/DateTimeData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_DATETIMEDATA_H -#define IECORE_DATETIMEDATA_H +#pragma once #include "IECore/Export.h" #include "IECore/TypedData.h" @@ -57,4 +56,3 @@ IECORE_API void murmurHashAppend( IECore::MurmurHash &h, const boost::posix_time } // namespace IECore -#endif // IECORE_DATETIMEDATA_H diff --git a/include/IECore/DateTimeParameter.h b/include/IECore/DateTimeParameter.h index 31f1f03a9a..8c53802d72 100644 --- a/include/IECore/DateTimeParameter.h +++ b/include/IECore/DateTimeParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DATETIMEPARAMETER_H -#define IE_CORE_DATETIMEPARAMETER_H +#pragma once #include "IECore/DateTimeData.h" #include "IECore/TypedParameter.h" @@ -47,4 +46,3 @@ IE_CORE_DECLAREPTR( DateTimeParameter ); } -#endif // IE_CORE_DATETIMEPARAMETER_H diff --git a/include/IECore/Deleter.h b/include/IECore/Deleter.h index 29abc026e4..560eb31c05 100644 --- a/include/IECore/Deleter.h +++ b/include/IECore/Deleter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DELETER_H -#define IE_CORE_DELETER_H +#pragma once namespace IECore @@ -73,4 +72,3 @@ struct NullDeleter } // namespace IECore -#endif // IE_CORE_DELETER_H diff --git a/include/IECore/DespatchTypedData.h b/include/IECore/DespatchTypedData.h index 75322cead8..c82911f8a9 100644 --- a/include/IECore/DespatchTypedData.h +++ b/include/IECore/DespatchTypedData.h @@ -37,8 +37,7 @@ /// TypedData instances when given only a Data *. -#ifndef IE_CORE_DESPATCHTYPEDDATA_H -#define IE_CORE_DESPATCHTYPEDDATA_H +#pragma once #include "IECore/Data.h" #include "IECore/Exception.h" @@ -150,4 +149,3 @@ struct TraitsTest; #include "IECore/DespatchTypedData.inl" -#endif // IE_CORE_DESPATCHTYPEDDATA_H diff --git a/include/IECore/DespatchTypedData.inl b/include/IECore/DespatchTypedData.inl index 19c6a95026..98450d84f6 100644 --- a/include/IECore/DespatchTypedData.inl +++ b/include/IECore/DespatchTypedData.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DESPATCHTYPEDDATA_INL -#define IE_CORE_DESPATCHTYPEDDATA_INL +#pragma once #include "IECore/DateTimeData.h" #include "IECore/SimpleTypedData.h" @@ -547,5 +546,3 @@ struct TraitsTest }; } - -#endif // IE_CORE_DESPATCHTYPEDDATA_INL diff --git a/include/IECore/DimensionTraits.h b/include/IECore/DimensionTraits.h index 70bc60f084..44455587f2 100644 --- a/include/IECore/DimensionTraits.h +++ b/include/IECore/DimensionTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DIMENSIONTRAITS_H -#define IE_CORE_DIMENSIONTRAITS_H +#pragma once namespace IECore { @@ -59,5 +58,3 @@ struct DimensionTraits } // namespace IECore #include "IECore/DimensionTraits.inl" - -#endif // IE_CORE_DIMENSIONTRAITS_INL diff --git a/include/IECore/DimensionTraits.inl b/include/IECore/DimensionTraits.inl index 42898f8749..3c9c1228c8 100644 --- a/include/IECore/DimensionTraits.inl +++ b/include/IECore/DimensionTraits.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DIMENSIONTRAITS_INL -#define IE_CORE_DIMENSIONTRAITS_INL +#pragma once #include "IECore/Export.h" #include "IECore/LineSegment.h" @@ -85,5 +84,3 @@ struct DimensionTraits<3, T> }; } - -#endif // IE_CORE_DIMENSIONTRAITS_INL diff --git a/include/IECore/DirNameParameter.h b/include/IECore/DirNameParameter.h index 28ef71ddea..8de4934e7b 100644 --- a/include/IECore/DirNameParameter.h +++ b/include/IECore/DirNameParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DIRNAMEPARAMETER_H -#define IE_CORE_DIRNAMEPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/PathParameter.h" @@ -66,4 +65,3 @@ IE_CORE_DECLAREPTR( DirNameParameter ) } // namespace IECore -#endif // IE_CORE_DIRNAMEPARAMETER_H diff --git a/include/IECore/EmptyFrameList.h b/include/IECore/EmptyFrameList.h index 3c27dfef61..3305d99871 100644 --- a/include/IECore/EmptyFrameList.h +++ b/include/IECore/EmptyFrameList.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_EMPTYFRAMELIST_H -#define IE_CORE_EMPTYFRAMELIST_H +#pragma once #include "IECore/Export.h" #include "IECore/FrameList.h" @@ -69,4 +68,3 @@ IE_CORE_DECLAREPTR( EmptyFrameList ); } // namespace IECore -#endif // IE_CORE_EMPTYFRAMELIST_H diff --git a/include/IECore/EuclideanToSphericalTransform.h b/include/IECore/EuclideanToSphericalTransform.h index a71f847c73..a96a55a2d7 100644 --- a/include/IECore/EuclideanToSphericalTransform.h +++ b/include/IECore/EuclideanToSphericalTransform.h @@ -32,9 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_EUCLIDEANTOSPHERICALTRANSFORM_H -#define IE_CORE_EUCLIDEANTOSPHERICALTRANSFORM_H - +#pragma once #include "IECore/SpaceTransform.h" #include "IECore/TypeTraits.h" @@ -75,4 +73,3 @@ typedef EuclideanToSphericalTransform EuclideanToSpheric #include "IECore/EuclideanToSphericalTransform.inl" -#endif // IE_CORE_EUCLIDEANTOSPHERICALTRANSFORM_H diff --git a/include/IECore/EuclideanToSphericalTransform.inl b/include/IECore/EuclideanToSphericalTransform.inl index 870399d0c6..1c784190bc 100644 --- a/include/IECore/EuclideanToSphericalTransform.inl +++ b/include/IECore/EuclideanToSphericalTransform.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_EUCLIDEANTOSPHERICALTRANSFORM_INL -#define IE_CORE_EUCLIDEANTOSPHERICALTRANSFORM_INL +#pragma once #include "IECore/Math.h" #include "IECore/VectorTraits.h" @@ -76,8 +75,5 @@ typename EuclideanToSphericalTransform::InverseType EuclideanToSphericalTr return InverseType(); } - } // namespace IECore -#endif // IE_CORE_EUCLIDEANTOSPHERICALTRANSFORM_INL - diff --git a/include/IECore/Exception.h b/include/IECore/Exception.h index 4ae79b885b..c43a12d603 100644 --- a/include/IECore/Exception.h +++ b/include/IECore/Exception.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_EXCEPTION_H -#define IE_CORE_EXCEPTION_H +#pragma once #include "IECore/Export.h" #include "IECore/RefCounted.h" @@ -137,4 +136,3 @@ namespace IECore }; } -#endif // IE_CORE_EXCEPTION_H diff --git a/include/IECore/ExclusionFrameList.h b/include/IECore/ExclusionFrameList.h index abc9b157ab..9e701e0bd8 100644 --- a/include/IECore/ExclusionFrameList.h +++ b/include/IECore/ExclusionFrameList.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_EXCLUSIONFRAMELIST_H -#define IE_CORE_EXCLUSIONFRAMELIST_H +#pragma once #include "IECore/Export.h" #include "IECore/FrameList.h" @@ -81,4 +80,3 @@ IE_CORE_DECLAREPTR( ExclusionFrameList ); } // namespace IECore -#endif // IE_CORE_EXCLUSIONFRAMELIST_H diff --git a/include/IECore/Export.h b/include/IECore/Export.h index c0fa9132cf..6de2ea805c 100644 --- a/include/IECore/Export.h +++ b/include/IECore/Export.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_EXPORT_H -#define IE_CORE_EXPORT_H +#pragma once // Define platform-specific macros for importing/exporting symbols #ifdef _MSC_VER @@ -70,5 +69,3 @@ #else #define IECORE_API IECORE_IMPORT #endif - -#endif // #ifndef IE_CORE_EXPORT_H diff --git a/include/IECore/FastFloat.h b/include/IECore/FastFloat.h index 985c78c7b2..4467b0e009 100644 --- a/include/IECore/FastFloat.h +++ b/include/IECore/FastFloat.h @@ -38,8 +38,7 @@ /// because apparently a simple (int)myFloat is actually fairly slow. See /// Physically Based Rendering p.856 for more detail. -#ifndef IE_CORE_FASTFLOAT_H -#define IE_CORE_FASTFLOAT_H +#pragma once #include "IECore/Export.h" @@ -55,4 +54,3 @@ IECORE_API inline int fastFloatCeil(double v); #include "IECore/FastFloat.inl" -#endif // IE_CORE_FASTFLOAT_H diff --git a/include/IECore/FastFloat.inl b/include/IECore/FastFloat.inl index 4267c8c284..3720d8e344 100644 --- a/include/IECore/FastFloat.inl +++ b/include/IECore/FastFloat.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FASTFLOAT_INL -#define IE_CORE_FASTFLOAT_INL +#pragma once #include @@ -121,5 +120,3 @@ namespace IECore #endif } // namespace IECore - -#endif // IE_CORE_FASTFLOAT_INL diff --git a/include/IECore/FileIndexedIO.h b/include/IECore/FileIndexedIO.h index 5f6343cea9..434976d64c 100644 --- a/include/IECore/FileIndexedIO.h +++ b/include/IECore/FileIndexedIO.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FILEINDEXEDIO_H -#define IE_CORE_FILEINDEXEDIO_H +#pragma once #include "IECore/Export.h" #include "IECore/StreamIndexedIO.h" @@ -82,4 +81,3 @@ IE_CORE_DECLAREPTR( FileIndexedIO ) } -#endif // IE_CORE_FILEINDEXEDIO_H diff --git a/include/IECore/FileNameParameter.h b/include/IECore/FileNameParameter.h index a9ff6ef418..cb85a3454b 100644 --- a/include/IECore/FileNameParameter.h +++ b/include/IECore/FileNameParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FILENAMEPARAMETER_H -#define IE_CORE_FILENAMEPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/PathParameter.h" @@ -73,4 +72,3 @@ IE_CORE_DECLAREPTR( FileNameParameter ) } // namespace IECore -#endif // IE_CORE_FILENAMEPARAMETER_H diff --git a/include/IECore/FileSequence.h b/include/IECore/FileSequence.h index 6d38643124..534481664e 100644 --- a/include/IECore/FileSequence.h +++ b/include/IECore/FileSequence.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FILESEQUENCE_H -#define IE_CORE_FILESEQUENCE_H +#pragma once #include "IECore/Export.h" #include "IECore/FrameList.h" @@ -135,4 +134,3 @@ class IECORE_API FileSequence : public RunTimeTyped } // namespace IECore -#endif // IE_CORE_FILESEQUENCE_H diff --git a/include/IECore/FileSequenceFunctions.h b/include/IECore/FileSequenceFunctions.h index 6e6a5f10ee..7a088fc907 100644 --- a/include/IECore/FileSequenceFunctions.h +++ b/include/IECore/FileSequenceFunctions.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FILESEQUENCEFUNCTIONS_H -#define IE_CORE_FILESEQUENCEFUNCTIONS_H +#pragma once #include "IECore/Export.h" #include "IECore/FileSequence.h" @@ -65,4 +64,3 @@ IECORE_API FrameListPtr frameListFromList( const std::vector< FrameList::Frame > } // namespace IECore -#endif // IE_CORE_FILESEQUENCEFUNCTIONS_H diff --git a/include/IECore/FileSequenceParameter.h b/include/IECore/FileSequenceParameter.h index 83eec12978..52cda272d4 100644 --- a/include/IECore/FileSequenceParameter.h +++ b/include/IECore/FileSequenceParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FILESEQUENCEPARAMETER_H -#define IE_CORE_FILESEQUENCEPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/FileSequence.h" @@ -100,4 +99,3 @@ IE_CORE_DECLAREPTR( FileSequenceParameter ); } // namespace IECore -#endif // IE_CORE_FILESEQUENCEPARAMETER_H diff --git a/include/IECore/FileSequenceVectorParameter.h b/include/IECore/FileSequenceVectorParameter.h index 8c843781c1..ec6834537c 100644 --- a/include/IECore/FileSequenceVectorParameter.h +++ b/include/IECore/FileSequenceVectorParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FILESEQUENCEVECTORPARAMETER_H -#define IE_CORE_FILESEQUENCEVECTORPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/FileSequence.h" @@ -104,4 +103,3 @@ IE_CORE_DECLAREPTR( FileSequenceVectorParameter ); } // namespace IECore -#endif // IE_CORE_FILESEQUENCEVECTORPARAMETER_H diff --git a/include/IECore/FilteredMessageHandler.h b/include/IECore/FilteredMessageHandler.h index 0edb632a76..a64000e500 100644 --- a/include/IECore/FilteredMessageHandler.h +++ b/include/IECore/FilteredMessageHandler.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FILTEREDMESSAGEHANDLER_H -#define IE_CORE_FILTEREDMESSAGEHANDLER_H +#pragma once #include "IECore/Export.h" #include "IECore/MessageHandler.h" @@ -70,4 +69,3 @@ class IECORE_API FilteredMessageHandler : public MessageHandler }; // namespace IECore -#endif // IE_CORE_FILTEREDMESSAGEHANDLER_H diff --git a/include/IECore/FrameList.h b/include/IECore/FrameList.h index 61f683a9e0..f71d6807b0 100644 --- a/include/IECore/FrameList.h +++ b/include/IECore/FrameList.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FRAMELIST_H -#define IE_CORE_FRAMELIST_H +#pragma once #include "IECore/Export.h" #include "IECore/RunTimeTyped.h" @@ -106,4 +105,3 @@ class IECORE_API FrameList : public RunTimeTyped #include "IECore/FrameList.inl" -#endif // IE_CORE_FRAMELIST_H diff --git a/include/IECore/FrameList.inl b/include/IECore/FrameList.inl index ad42b85578..5c47a6bfe9 100644 --- a/include/IECore/FrameList.inl +++ b/include/IECore/FrameList.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FRAMELIST_INL -#define IE_CORE_FRAMELIST_INL +#pragma once namespace IECore { @@ -45,5 +44,3 @@ FrameList::Parser::Parser() } } // namespace IECore - -#endif // IE_CORE_FRAMELIST_INL diff --git a/include/IECore/FrameListParameter.h b/include/IECore/FrameListParameter.h index ab5c75f831..fbb2de06fa 100644 --- a/include/IECore/FrameListParameter.h +++ b/include/IECore/FrameListParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FRAMELISTPARAMETER_H -#define IE_CORE_FRAMELISTPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/FrameList.h" @@ -75,4 +74,3 @@ IE_CORE_DECLAREPTR( FrameListParameter ); } // namespace IECore -#endif // IE_CORE_FRAMELISTPARAMETER_H diff --git a/include/IECore/FrameRange.h b/include/IECore/FrameRange.h index ff22921316..cdc792f5bb 100644 --- a/include/IECore/FrameRange.h +++ b/include/IECore/FrameRange.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_FRAMERANGE_H -#define IE_CORE_FRAMERANGE_H +#pragma once #include "IECore/Export.h" #include "IECore/FrameList.h" @@ -85,4 +84,3 @@ IE_CORE_DECLAREPTR( FrameRange ); } // namespace IECore -#endif // IE_CORE_FRAMERANGE_H diff --git a/include/IECore/FromCoreConverter.h b/include/IECore/FromCoreConverter.h index 5e9f8271df..03ded47ffb 100644 --- a/include/IECore/FromCoreConverter.h +++ b/include/IECore/FromCoreConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_FROMCORECONVERTER_H -#define IECORE_FROMCORECONVERTER_H +#pragma once #include "IECore/Converter.h" #include "IECore/Export.h" @@ -73,4 +72,3 @@ IE_CORE_DECLAREPTR( FromCoreConverter ); } // namespace IECore -#endif // IECORE_FROMCORECONVERTER_H diff --git a/include/IECore/GeometricTypedData.h b/include/IECore/GeometricTypedData.h index 7284c2dc61..3536f3707a 100644 --- a/include/IECore/GeometricTypedData.h +++ b/include/IECore/GeometricTypedData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_GEOMETRICTYPEDDATA_H -#define IECORE_GEOMETRICTYPEDDATA_H +#pragma once #include "IECore/TypedData.h" @@ -139,4 +138,3 @@ class IECORE_EXPORT GeometricTypedData : public TypedData } // namespace IECore -#endif // IECORE_GEOMETRICTYPEDDATA_H diff --git a/include/IECore/GeometricTypedData.inl b/include/IECore/GeometricTypedData.inl index d62d63704b..02d1192f6a 100644 --- a/include/IECore/GeometricTypedData.inl +++ b/include/IECore/GeometricTypedData.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_GEOMETRICTYPEDDATA_INL -#define IECORE_GEOMETRICTYPEDDATA_INL +#pragma once namespace IECore { @@ -156,5 +155,3 @@ void GeometricTypedData::memoryUsage( Object::MemoryAccumulator &accumulator } } // namespace IECore - -#endif // IECORE_GEOMETRICTYPEDDATA_INL diff --git a/include/IECore/GeometricTypedDataInterpolator.inl b/include/IECore/GeometricTypedDataInterpolator.inl index 8424977741..983695c178 100644 --- a/include/IECore/GeometricTypedDataInterpolator.inl +++ b/include/IECore/GeometricTypedDataInterpolator.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/GeometricTypedData.h" namespace IECore diff --git a/include/IECore/HalfTypeTraits.h b/include/IECore/HalfTypeTraits.h index 996ba87734..68a23753a6 100644 --- a/include/IECore/HalfTypeTraits.h +++ b/include/IECore/HalfTypeTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_HALFTYPETRAITS_H -#define IE_CORE_HALFTYPETRAITS_H +#pragma once #include "IECore/Export.h" @@ -99,4 +98,3 @@ struct is_unsigned : public false_type{}; } -#endif // IE_CORE_HALFTYPETRAITS_H diff --git a/include/IECore/HeaderGenerator.h b/include/IECore/HeaderGenerator.h index 8dd59b7ce2..12d00def0a 100644 --- a/include/IECore/HeaderGenerator.h +++ b/include/IECore/HeaderGenerator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_HEADERGENERATOR_H -#define IE_CORE_HEADERGENERATOR_H +#pragma once #include "IECore/CompoundObject.h" #include "IECore/Export.h" @@ -61,4 +60,3 @@ class IECORE_API HeaderGenerator } // namespace IECore -#endif // IE_CORE_HEADERGENERATOR_H diff --git a/include/IECore/HexConversion.h b/include/IECore/HexConversion.h index aa52181faf..377c536465 100644 --- a/include/IECore/HexConversion.h +++ b/include/IECore/HexConversion.h @@ -35,8 +35,7 @@ //! \file HexConversion.h /// Defines template conversions between hex and decimal -#ifndef IE_CORE_HEXCONVERSION_H -#define IE_CORE_HEXCONVERSION_H +#pragma once #include "boost/type_traits/is_integral.hpp" #include "boost/type_traits/is_same.hpp" @@ -192,4 +191,3 @@ inline void hexToDec( InputIterator first, InputIterator last, OutputIterator re } // namespace IECore -#endif // IE_CORE_HEXCONVERSION_H diff --git a/include/IECore/IECore.h b/include/IECore/IECore.h index c545beb56f..0c9f3144aa 100644 --- a/include/IECore/IECore.h +++ b/include/IECore/IECore.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_CORE_H -#define IE_CORE_CORE_H +#pragma once #include "IECore/Export.h" #include "IECore/Version.h" @@ -304,4 +303,3 @@ IECORE_API bool withFreeType(); /// IECORE_OP_PRESET_PATHS
/// Used to save and load presets for use with Ops. -#endif // IE_CORE_CORE_H diff --git a/include/IECore/IFFFile.h b/include/IECore/IFFFile.h index aeba776405..09527a4ce1 100644 --- a/include/IECore/IFFFile.h +++ b/include/IECore/IFFFile.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_IFFFILE_H -#define IE_CORE_IFFFILE_H +#pragma once #include "IECore/Export.h" #include "IECore/RefCounted.h" @@ -186,4 +185,3 @@ class IECORE_API IFFFile : public RefCounted #include "IFFFile.inl" -#endif // IE_CORE_IFFFILE_H diff --git a/include/IECore/IFFFile.inl b/include/IECore/IFFFile.inl index e04a6d354b..f7c27ba1d5 100644 --- a/include/IECore/IFFFile.inl +++ b/include/IECore/IFFFile.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_IFFFILE_INL -#define IE_CORE_IFFFILE_INL +#pragma once #include "IECore/ByteOrder.h" #include "IECore/MessageHandler.h" @@ -127,5 +126,3 @@ void IFFFile::readData( const char *dataBuffer, T *attrBuffer, size_t n ) } } // namespace IECore - -#endif // IE_CORE_IFFFILE_INL diff --git a/include/IECore/ImathHash.h b/include/IECore/ImathHash.h index f41bf2f010..e1641c5dfb 100644 --- a/include/IECore/ImathHash.h +++ b/include/IECore/ImathHash.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_IMATHHASH_H -#define IE_CORE_IMATHHASH_H +#pragma once IECORE_PUSH_DEFAULT_VISIBILITY #include "Imath/half.h" @@ -90,4 +89,3 @@ template <> struct hash : public IECore::Detail::PodHash ImathRand48Adapter; } // namespace IECore -#endif // IE_CORE_IMATHRANDADAPTER_H diff --git a/include/IECore/IndexedIO.h b/include/IECore/IndexedIO.h index 98ebe8e053..6153d8b815 100644 --- a/include/IECore/IndexedIO.h +++ b/include/IECore/IndexedIO.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_INDEXEDIO_H -#define IE_CORE_INDEXEDIO_H +#pragma once #include "IECore/Export.h" #include "IECore/InternedString.h" @@ -563,4 +562,3 @@ class IECORE_API IndexedIO : public RunTimeTyped #include "IndexedIO.inl" -#endif // IE_CORE_INDEXEDIO_H diff --git a/include/IECore/IndexedIO.inl b/include/IECore/IndexedIO.inl index 5f6dfe22f9..5b7e120c72 100644 --- a/include/IECore/IndexedIO.inl +++ b/include/IECore/IndexedIO.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "OpenEXR/ImfXdr.h" #include diff --git a/include/IECore/IndexedIOAlgo.h b/include/IECore/IndexedIOAlgo.h index 13753c73b7..3c6281aab6 100644 --- a/include/IECore/IndexedIOAlgo.h +++ b/include/IECore/IndexedIOAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_INDEXEDIOALGO_H -#define IE_CORE_INDEXEDIOALGO_H +#pragma once #include "IECore/Export.h" #include "IECore/IndexedIO.h" @@ -184,4 +183,3 @@ inline std::ostream &operator <<( std::ostream &s, const FileStats &stats) -#endif // IE_CORE_INDEXEDIOALGO_H diff --git a/include/IECore/InternedString.h b/include/IECore/InternedString.h index 30c6d7de08..c2ded7a19a 100644 --- a/include/IECore/InternedString.h +++ b/include/IECore/InternedString.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_INTERNEDSTRING_H -#define IECORE_INTERNEDSTRING_H +#pragma once #include "IECore/Export.h" @@ -121,4 +120,3 @@ IECORE_API std::ostream &operator << ( std::ostream &o, const InternedString &st #include "IECore/InternedString.inl" -#endif // IECORE_INTERNEDSTRING_H diff --git a/include/IECore/InternedString.inl b/include/IECore/InternedString.inl index 02d67e88ca..51f62eebfb 100644 --- a/include/IECore/InternedString.inl +++ b/include/IECore/InternedString.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_INTERNEDSTRING_INL -#define IECORE_INTERNEDSTRING_INL +#pragma once #include @@ -145,5 +144,3 @@ namespace fmt template <> struct formatter : ostream_formatter { }; } // namespace fmt - -#endif // IECORE_INTERNEDSTRING_INL diff --git a/include/IECore/Interpolator.h b/include/IECore/Interpolator.h index 0738ca355f..085f26bf19 100644 --- a/include/IECore/Interpolator.h +++ b/include/IECore/Interpolator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_INTERPOLATOR_H -#define IE_CORE_INTERPOLATOR_H +#pragma once #include #include @@ -77,4 +76,3 @@ struct CubicInterpolator #include "TypedDataInterpolator.inl" #include "GeometricTypedDataInterpolator.inl" -#endif // IE_CORE_INTERPOLATOR_H diff --git a/include/IECore/Interpolator.inl b/include/IECore/Interpolator.inl index 4e834b2d31..586dbdba90 100644 --- a/include/IECore/Interpolator.inl +++ b/include/IECore/Interpolator.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/TypedData.h" namespace IECore diff --git a/include/IECore/InverseDistanceWeightedInterpolation.h b/include/IECore/InverseDistanceWeightedInterpolation.h index 7e2b11510d..e9270edf72 100644 --- a/include/IECore/InverseDistanceWeightedInterpolation.h +++ b/include/IECore/InverseDistanceWeightedInterpolation.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_INVERSEDISTANCEWEIGHTEDINTERPOLATION_H -#define IE_CORE_INVERSEDISTANCEWEIGHTEDINTERPOLATION_H +#pragma once #include "IECore/KDTree.h" @@ -112,4 +111,3 @@ typedef InverseDistanceWeightedInterpolation< std::vector::const_ite #include "InverseDistanceWeightedInterpolation.inl" -#endif // IE_CORE_INVERSEDISTANCEWEIGHTEDINTERPOLATION_H diff --git a/include/IECore/InverseDistanceWeightedInterpolation.inl b/include/IECore/InverseDistanceWeightedInterpolation.inl index f6f73451f8..e79b3d0e9a 100644 --- a/include/IECore/InverseDistanceWeightedInterpolation.inl +++ b/include/IECore/InverseDistanceWeightedInterpolation.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/VectorOps.h" #include diff --git a/include/IECore/KDTree.h b/include/IECore/KDTree.h index a9969cc371..47adf39d55 100644 --- a/include/IECore/KDTree.h +++ b/include/IECore/KDTree.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_KDTREE_H -#define IE_CORE_KDTREE_H +#pragma once #include "IECore/Export.h" #include "IECore/VectorTraits.h" @@ -224,4 +223,3 @@ typedef KDTree::const_iterator> V3dTree; #include "KDTree.inl" -#endif // IE_CORE_KDTREE_H diff --git a/include/IECore/KDTree.inl b/include/IECore/KDTree.inl index 73b3b71f6c..dab2c8f356 100644 --- a/include/IECore/KDTree.inl +++ b/include/IECore/KDTree.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/BoxOps.h" #include "IECore/VectorOps.h" diff --git a/include/IECore/LRUCache.h b/include/IECore/LRUCache.h index 099938dd5a..1561ae1173 100644 --- a/include/IECore/LRUCache.h +++ b/include/IECore/LRUCache.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LRUCACHE_H -#define IECORE_LRUCACHE_H +#pragma once #include "boost/function.hpp" #include "boost/noncopyable.hpp" @@ -205,4 +204,3 @@ class LRUCache : private boost::noncopyable #include "IECore/LRUCache.inl" -#endif // IECORE_LRUCACHE_H diff --git a/include/IECore/LRUCache.inl b/include/IECore/LRUCache.inl index 310e9af729..d1de34b583 100644 --- a/include/IECore/LRUCache.inl +++ b/include/IECore/LRUCache.inl @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LRUCACHE_INL -#define IECORE_LRUCACHE_INL +#pragma once #include "IECore/Exception.h" @@ -785,5 +784,3 @@ void LRUCache::nullRemovalCallback( const Key &ke } } // namespace IECore - -#endif // IECORE_LRUCACHE_INL diff --git a/include/IECore/LensModel.h b/include/IECore/LensModel.h index 2158e522d3..5f359a5111 100644 --- a/include/IECore/LensModel.h +++ b/include/IECore/LensModel.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LENSMODEL_H -#define IECORE_LENSMODEL_H +#pragma once #include "IECore/CompoundParameter.h" #include "IECore/Export.h" @@ -174,5 +173,4 @@ IE_CORE_DECLAREPTR(LensModel); #include "LensModel.inl" -#endif // IECORE_LENSMODEL_H diff --git a/include/IECore/LensModel.inl b/include/IECore/LensModel.inl index 94e583f1c6..6bb5225876 100644 --- a/include/IECore/LensModel.inl +++ b/include/IECore/LensModel.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + namespace IECore { diff --git a/include/IECore/LevelFilteredMessageHandler.h b/include/IECore/LevelFilteredMessageHandler.h index 5fb3b26abf..4c75d830ee 100644 --- a/include/IECore/LevelFilteredMessageHandler.h +++ b/include/IECore/LevelFilteredMessageHandler.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_LEVELFILTEREDMESSAGEHANDLER_H -#define IE_CORE_LEVELFILTEREDMESSAGEHANDLER_H +#pragma once #include "IECore/Export.h" #include "IECore/FilteredMessageHandler.h" @@ -84,4 +83,3 @@ class IECORE_API LevelFilteredMessageHandler : public FilteredMessageHandler }; // namespace IECore -#endif // IE_CORE_LEVELFILTEREDMESSAGEHANDLER_H diff --git a/include/IECore/LevenbergMarquardt.h b/include/IECore/LevenbergMarquardt.h index fcc7739c19..154a6b1402 100644 --- a/include/IECore/LevenbergMarquardt.h +++ b/include/IECore/LevenbergMarquardt.h @@ -33,8 +33,7 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_LEVENBERGMARQUARDT_H -#define IE_CORE_LEVENBERGMARQUARDT_H +#pragma once #include "IECore/TypeTraits.h" #include "IECore/VectorTypedData.h" @@ -172,4 +171,3 @@ class LevenbergMarquardt : public boost::noncopyable #include "IECore/LevenbergMarquardt.inl" -#endif // IE_CORE_LEVENBERGMARQUARDT_H diff --git a/include/IECore/LevenbergMarquardt.inl b/include/IECore/LevenbergMarquardt.inl index 11e3fdb7ca..4a65490528 100644 --- a/include/IECore/LevenbergMarquardt.inl +++ b/include/IECore/LevenbergMarquardt.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_LEVENBERGMARQUARDT_INL -#define IE_CORE_LEVENBERGMARQUARDT_INL +#pragma once #include "IECore/Exception.h" @@ -862,5 +861,3 @@ T LevenbergMarquardt::euclideanNorm( typename std::vector } } // namespace IECore - -#endif // IE_CORE_LEVENBERGMARQUARDT_INL diff --git a/include/IECore/LineSegment.h b/include/IECore/LineSegment.h index c168706b5d..6425bb3a5b 100644 --- a/include/IECore/LineSegment.h +++ b/include/IECore/LineSegment.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LINESEGMENT_H -#define IECORE_LINESEGMENT_H +#pragma once #include "IECore/Export.h" #include "IECore/VectorTraits.h" @@ -132,4 +131,3 @@ std::ostream &operator << ( std::ostream &o, const LineSegment &lineSegment ) #include "IECore/LineSegment.inl" -#endif // IECORE_LINESEGMENT_H diff --git a/include/IECore/LineSegment.inl b/include/IECore/LineSegment.inl index 44dee24e13..a8e337ce39 100644 --- a/include/IECore/LineSegment.inl +++ b/include/IECore/LineSegment.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LINESEGMENT_INL -#define IECORE_LINESEGMENT_INL +#pragma once #include "Imath/ImathFun.h" @@ -244,5 +243,3 @@ std::ostream &operator << ( std::ostream &o, const LineSegment &lineSegment ) } } // namespace IECore - -#endif // IECORE_LINESEGMENT_INL diff --git a/include/IECore/Lookup.h b/include/IECore/Lookup.h index d2eff30c7d..fb673c21b1 100644 --- a/include/IECore/Lookup.h +++ b/include/IECore/Lookup.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LOOKUP_H -#define IECORE_LOOKUP_H +#pragma once #include "IECore/Export.h" @@ -89,4 +88,3 @@ typedef Lookup LookupfColor4f; #include "IECore/Lookup.inl" -#endif // IECORE_LOOKUP_H diff --git a/include/IECore/Lookup.inl b/include/IECore/Lookup.inl index b5764338fc..821bb945a0 100644 --- a/include/IECore/Lookup.inl +++ b/include/IECore/Lookup.inl @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LOOKUP_INL -#define IECORE_LOOKUP_INL +#pragma once #include "IECore/FastFloat.h" @@ -93,5 +92,3 @@ inline Y Lookup::operator() ( X x ) const } } // namespace IECore - -#endif // IECORE_LOOKUP_INL diff --git a/include/IECore/Math.h b/include/IECore/Math.h index 461db47b86..10df4f3565 100644 --- a/include/IECore/Math.h +++ b/include/IECore/Math.h @@ -36,8 +36,7 @@ /// Defines useful mathematical operations that don't seem to belong /// elsewhere. -#ifndef IECORE_MATH_H -#define IECORE_MATH_H +#pragma once #include @@ -62,4 +61,3 @@ T smoothstep( T v0, T v1, T x ); #include "IECore/Math.inl" -#endif // IECORE_MATH_H diff --git a/include/IECore/Math.inl b/include/IECore/Math.inl index 6a921b6463..a924019f9a 100644 --- a/include/IECore/Math.inl +++ b/include/IECore/Math.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_MATH_INL -#define IECORE_MATH_INL +#pragma once namespace IECore { @@ -61,5 +60,3 @@ T smoothstep( T v0, T v1, T v ) } } // namespace IECore - -#endif // IECORE_MATH_INL diff --git a/include/IECore/MatrixAlgo.h b/include/IECore/MatrixAlgo.h index 74ed16d73d..a361b36584 100644 --- a/include/IECore/MatrixAlgo.h +++ b/include/IECore/MatrixAlgo.h @@ -36,8 +36,7 @@ /// Defines useful operations on Imath::Matrix types. /// \ingroup mathGroup -#ifndef IE_CORE_MATRIXALGO_H -#define IE_CORE_MATRIXALGO_H +#pragma once #include "IECore/Convert.h" #include "IECore/Export.h" @@ -69,4 +68,3 @@ template<> IECORE_API Imath::M44f convert( const Imath::M44d &in ); #include "IECore/MatrixAlgo.inl" -#endif // IE_CORE_MATRIXALGO_H diff --git a/include/IECore/MatrixAlgo.inl b/include/IECore/MatrixAlgo.inl index 257b24742b..5d8a537ef4 100644 --- a/include/IECore/MatrixAlgo.inl +++ b/include/IECore/MatrixAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MATRIXALGO_INL -#define IE_CORE_MATRIXALGO_INL +#pragma once namespace IECore { @@ -128,4 +127,3 @@ float determinant( const Imath::Matrix44 &m ) } // namespace IECore -#endif // IE_CORE_MATRIXALGO_INL diff --git a/include/IECore/MatrixInterpolator.inl b/include/IECore/MatrixInterpolator.inl index 7f75edd23e..441b4c26e2 100644 --- a/include/IECore/MatrixInterpolator.inl +++ b/include/IECore/MatrixInterpolator.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY diff --git a/include/IECore/MatrixMultiplyOp.h b/include/IECore/MatrixMultiplyOp.h index d25aa5a547..dd514e0f24 100644 --- a/include/IECore/MatrixMultiplyOp.h +++ b/include/IECore/MatrixMultiplyOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MATRIXMULTIPLYOP_H -#define IE_CORE_MATRIXMULTIPLYOP_H +#pragma once #include "IECore/Export.h" #include "IECore/ModifyOp.h" @@ -71,6 +70,5 @@ IE_CORE_DECLAREPTR( MatrixMultiplyOp ); } // namespace IECore -#endif // IE_CORE_MATRIXMULTIPLYOP_H diff --git a/include/IECore/MatrixOps.h b/include/IECore/MatrixOps.h index 130429a0a3..3b30512bbf 100644 --- a/include/IECore/MatrixOps.h +++ b/include/IECore/MatrixOps.h @@ -41,8 +41,7 @@ /// give less intuitive syntax but are compatible with any classes for which /// a valid MatrixTraits specialisation exists. -#ifndef IE_CORE_MATRIXOPS_H -#define IE_CORE_MATRIXOPS_H +#pragma once #include "IECore/MatrixTraits.h" @@ -81,4 +80,3 @@ struct MatConvert #include "IECore/MatrixOps.inl" -#endif // IE_CORE_MATRIXOPS_H diff --git a/include/IECore/MatrixOps.inl b/include/IECore/MatrixOps.inl index a939c4df1a..954e01827b 100644 --- a/include/IECore/MatrixOps.inl +++ b/include/IECore/MatrixOps.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MATRIXOPS_INL -#define IE_CORE_MATRIXOPS_INL +#pragma once namespace IECore { @@ -92,5 +91,3 @@ inline S MatConvert::operator()( const T &m ) const } // namespace IECore - -#endif // IE_CORE_MATRIXOPS_INL diff --git a/include/IECore/MatrixTraits.h b/include/IECore/MatrixTraits.h index 6591719845..557891a412 100644 --- a/include/IECore/MatrixTraits.h +++ b/include/IECore/MatrixTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MATRIXTRAITS_H -#define IE_CORE_MATRIXTRAITS_H +#pragma once #include "IECore/Export.h" @@ -99,4 +98,3 @@ struct MatrixTraits } // namespace IECore -#endif // IE_CORE_MATRIXTRAITS_H diff --git a/include/IECore/MeanSquaredError.h b/include/IECore/MeanSquaredError.h index 094491bd96..f16eaa9f44 100644 --- a/include/IECore/MeanSquaredError.h +++ b/include/IECore/MeanSquaredError.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MEANSQUAREDERROR_H -#define IE_CORE_MEANSQUAREDERROR_H +#pragma once namespace IECore { @@ -54,4 +53,3 @@ struct MeanSquaredError #include "MeanSquaredError.inl" -#endif // IE_CORE_MEANSQUAREDERROR_H diff --git a/include/IECore/MeanSquaredError.inl b/include/IECore/MeanSquaredError.inl index 0905f0de89..779b5e5b15 100644 --- a/include/IECore/MeanSquaredError.inl +++ b/include/IECore/MeanSquaredError.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MEANSQUAREDERROR_INL -#define IE_CORE_MEANSQUAREDERROR_INL +#pragma once #include "IECore/TypeTraits.h" @@ -111,5 +110,3 @@ struct MeanSquaredError< T, R, typename boost::enable_if< TypeTraits::IsNumericS }; } // namespace IECore - -#endif // IE_CORE_MEANSQUAREDERROR_INL diff --git a/include/IECore/MemoryIndexedIO.h b/include/IECore/MemoryIndexedIO.h index 39e139f0a4..0d33778ba3 100644 --- a/include/IECore/MemoryIndexedIO.h +++ b/include/IECore/MemoryIndexedIO.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MEMORYINDEXEDIO_H -#define IE_CORE_MEMORYINDEXEDIO_H +#pragma once #include "IECore/Export.h" #include "IECore/StreamIndexedIO.h" @@ -72,4 +71,3 @@ IE_CORE_DECLAREPTR( MemoryIndexedIO ) } -#endif // IE_CORE_MEMORYINDEXEDIO_H diff --git a/include/IECore/MemoryStream.h b/include/IECore/MemoryStream.h index fe1f96eca7..8ac467ad12 100644 --- a/include/IECore/MemoryStream.h +++ b/include/IECore/MemoryStream.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MEMORYSTREAM_H -#define IE_CORE_MEMORYSTREAM_H +#pragma once #include "IECore/Export.h" #include "IECore/RefCounted.h" @@ -121,4 +120,3 @@ struct MemoryStreamSink : private MemoryStream } // namespace IECore -#endif // IE_CORE_MEMORYSTREAM_H diff --git a/include/IECore/MessageHandler.h b/include/IECore/MessageHandler.h index 8030a3bdf8..78dd9a77c3 100644 --- a/include/IECore/MessageHandler.h +++ b/include/IECore/MessageHandler.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_MESSAGEHANDLER_H -#define IECORE_MESSAGEHANDLER_H +#pragma once #include "IECore/Export.h" #include "IECore/RefCounted.h" @@ -162,4 +161,3 @@ inline void msg( MessageHandler::Level level, const std::string &context, fmt::f }; // namespace IECore -#endif // IECORE_MESSAGEHANDLER_H diff --git a/include/IECore/ModifyOp.h b/include/IECore/ModifyOp.h index 390dc6edc7..68daf881d8 100644 --- a/include/IECore/ModifyOp.h +++ b/include/IECore/ModifyOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_MODIFYOP_H -#define IE_CORE_MODIFYOP_H +#pragma once #include "IECore/Export.h" #include "IECore/Op.h" @@ -88,4 +87,3 @@ IE_CORE_DECLAREPTR( ModifyOp ); } // namespace IECore -#endif // IE_CORE_MODIFYOP_H diff --git a/include/IECore/MurmurHash.h b/include/IECore/MurmurHash.h index 91b20ea83a..066fde7d48 100644 --- a/include/IECore/MurmurHash.h +++ b/include/IECore/MurmurHash.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_MURMURHASH_H -#define IECORE_MURMURHASH_H +#pragma once #include "IECore/Export.h" @@ -125,4 +124,3 @@ IECORE_API std::ostream &operator << ( std::ostream &o, const MurmurHash &hash ) #include "IECore/MurmurHash.inl" -#endif // IECORE_MURMURHASH_H diff --git a/include/IECore/MurmurHash.inl b/include/IECore/MurmurHash.inl index 1c40a4ed01..9dfdb54a04 100644 --- a/include/IECore/MurmurHash.inl +++ b/include/IECore/MurmurHash.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_MURMURHASH_INL -#define IECORE_MURMURHASH_INL +#pragma once #include "IECore/InternedString.h" @@ -460,5 +459,3 @@ struct std::hash return h.h1() ^ h.h2(); } }; - -#endif // IECORE_MURMURHASH_INL diff --git a/include/IECore/NullMessageHandler.h b/include/IECore/NullMessageHandler.h index e8996632d4..b51ab2f379 100644 --- a/include/IECore/NullMessageHandler.h +++ b/include/IECore/NullMessageHandler.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_NULLMESSAGEHANDLER_H -#define IE_CORE_NULLMESSAGEHANDLER_H +#pragma once #include "IECore/Export.h" #include "IECore/MessageHandler.h" @@ -64,4 +63,3 @@ class IECORE_API NullMessageHandler : public MessageHandler }; // namespace IECore -#endif // IE_CORE_NULLMESSAGEHANDLER_H diff --git a/include/IECore/NullObject.h b/include/IECore/NullObject.h index 8725b96130..27a64b6408 100644 --- a/include/IECore/NullObject.h +++ b/include/IECore/NullObject.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_NULLOBJECT_H -#define IE_CORE_NULLOBJECT_H +#pragma once #include "IECore/Export.h" #include "IECore/Object.h" @@ -66,4 +65,3 @@ class IECORE_API NullObject : public Object } -#endif // IE_CORE_NULLOBJECT_H diff --git a/include/IECore/NumericParameter.h b/include/IECore/NumericParameter.h index acfd5d0c71..576d4ba62d 100644 --- a/include/IECore/NumericParameter.h +++ b/include/IECore/NumericParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_NUMERICPARAMETER_H -#define IE_CORE_NUMERICPARAMETER_H +#pragma once #include "IECore/Parameter.h" #include "IECore/TypedData.h" @@ -111,4 +110,3 @@ IE_CORE_DECLAREPTR( DoubleParameter ); } // namespace IECore -#endif // IE_CORE_NUMERICPARAMETER_H diff --git a/include/IECore/OStreamMessageHandler.h b/include/IECore/OStreamMessageHandler.h index b31fbcaf30..a045748512 100644 --- a/include/IECore/OStreamMessageHandler.h +++ b/include/IECore/OStreamMessageHandler.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OSTREAMMESSAGEHANDLER_H -#define IE_CORE_OSTREAMMESSAGEHANDLER_H +#pragma once #include "IECore/Export.h" #include "IECore/MessageHandler.h" @@ -94,4 +93,3 @@ class IECORE_API OStreamMessageHandler : public MessageHandler }; // namespace IECore -#endif // IE_CORE_OSTREAMMESSAGEHANDLER_H diff --git a/include/IECore/Object.h b/include/IECore/Object.h index ab04c687a9..1ce0f6f5c7 100644 --- a/include/IECore/Object.h +++ b/include/IECore/Object.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OBJECT_H -#define IE_CORE_OBJECT_H +#pragma once #include "IECore/Canceller.h" #include "IECore/Export.h" @@ -337,4 +336,3 @@ class IECORE_API Object : public RunTimeTyped #include "IECore/Object.inl" -#endif // IE_CORE_OBJECT_H diff --git a/include/IECore/Object.inl b/include/IECore/Object.inl index 21aea5eb27..fa9c7f999e 100644 --- a/include/IECore/Object.inl +++ b/include/IECore/Object.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OBJECT_INL -#define IE_CORE_OBJECT_INL +#pragma once #include "IECore/Exception.h" @@ -93,5 +92,3 @@ inline const Canceller *Object::LoadContext::canceller() } } // namespace IECore - -#endif // IE_CORE_OBJECT_INL diff --git a/include/IECore/ObjectInterpolator.h b/include/IECore/ObjectInterpolator.h index a9467ab74f..c2fe0e2440 100644 --- a/include/IECore/ObjectInterpolator.h +++ b/include/IECore/ObjectInterpolator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OBJECTINTERPOLATOR_H -#define IE_CORE_OBJECTINTERPOLATOR_H +#pragma once #include "IECore/Export.h" #include "IECore/Interpolator.h" @@ -72,4 +71,3 @@ class InterpolatorDescription } // namespace IECore -#endif // IE_CORE_OBJECTINTERPOLATOR_H diff --git a/include/IECore/ObjectMatrix.h b/include/IECore/ObjectMatrix.h index 363f22cd3b..71f3a752c9 100644 --- a/include/IECore/ObjectMatrix.h +++ b/include/IECore/ObjectMatrix.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_OBJECTMATRIX_H -#define IECORE_OBJECTMATRIX_H +#pragma once #include "IECore/Export.h" #include "IECore/Object.h" @@ -82,4 +81,3 @@ IE_CORE_DECLAREPTR( ObjectMatrix ); } // namespace IECore -#endif // IECORE_OBJECTMATRIX_H diff --git a/include/IECore/ObjectParameter.h b/include/IECore/ObjectParameter.h index 5e44e53654..f24e94fd7d 100644 --- a/include/IECore/ObjectParameter.h +++ b/include/IECore/ObjectParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OBJECTPARAMETER_H -#define IE_CORE_OBJECTPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/Parameter.h" @@ -74,4 +73,3 @@ IE_CORE_DECLAREPTR( ObjectParameter ); } // namespace IECore -#endif // IE_CORE_OBJECTPARAMETER_H diff --git a/include/IECore/ObjectPool.h b/include/IECore/ObjectPool.h index 20287c063c..3fbd4b9e87 100644 --- a/include/IECore/ObjectPool.h +++ b/include/IECore/ObjectPool.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_OBJECTPOOL_H -#define IECORE_OBJECTPOOL_H +#pragma once #include "IECore/Export.h" #include "IECore/MurmurHash.h" @@ -118,5 +117,4 @@ class IECORE_API ObjectPool : public RefCounted } // namespace IECore -#endif // IECORE_OBJECTPOOL_H diff --git a/include/IECore/ObjectReader.h b/include/IECore/ObjectReader.h index 99fd1282e6..cb98660e58 100644 --- a/include/IECore/ObjectReader.h +++ b/include/IECore/ObjectReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OBJECTREADER_H -#define IE_CORE_OBJECTREADER_H +#pragma once #include "IECore/CompoundData.h" #include "IECore/Export.h" @@ -80,4 +79,3 @@ IE_CORE_DECLAREPTR( ObjectReader ); } // namespace IECore -#endif // IE_CORE_OBJECTREADER_H diff --git a/include/IECore/ObjectVector.h b/include/IECore/ObjectVector.h index af459207ca..bedaaef565 100644 --- a/include/IECore/ObjectVector.h +++ b/include/IECore/ObjectVector.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_OBJECTVECTOR_H -#define IECORE_OBJECTVECTOR_H +#pragma once #include "IECore/Export.h" #include "IECore/Object.h" @@ -68,4 +67,3 @@ IE_CORE_DECLAREPTR( ObjectVector ) } -#endif // IECORE_OBJECTVECTOR_H diff --git a/include/IECore/ObjectWriter.h b/include/IECore/ObjectWriter.h index 70d520c851..a4012d21b8 100644 --- a/include/IECore/ObjectWriter.h +++ b/include/IECore/ObjectWriter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OBJECTWRITER_H -#define IE_CORE_OBJECTWRITER_H +#pragma once #include "IECore/Export.h" #include "IECore/Writer.h" @@ -77,4 +76,3 @@ IE_CORE_DECLAREPTR( ObjectWriter ); } // namespace IECore -#endif // IE_CORE_OBJECTWRITER_H diff --git a/include/IECore/Op.h b/include/IECore/Op.h index 49d70ac180..292a77a590 100644 --- a/include/IECore/Op.h +++ b/include/IECore/Op.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OP_H -#define IE_CORE_OP_H +#pragma once #include "IECore/Export.h" #include "IECore/Parameterised.h" @@ -98,4 +97,3 @@ IE_CORE_DECLAREPTR( Op ); } // namespace IECore -#endif // IE_CORE_OP_H diff --git a/include/IECore/OversamplesCalculator.h b/include/IECore/OversamplesCalculator.h index 93be73e624..f3bc391c1b 100644 --- a/include/IECore/OversamplesCalculator.h +++ b/include/IECore/OversamplesCalculator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_OVERSAMPLESCALCULATOR_H -#define IE_CORE_OVERSAMPLESCALCULATOR_H +#pragma once #include "IECore/Export.h" @@ -82,4 +81,3 @@ class IECORE_API OversamplesCalculator }; // namespace IECore -#endif // IE_CORE_OVERSAMPLESCALCULATOR_H diff --git a/include/IECore/OversamplesCalculator.inl b/include/IECore/OversamplesCalculator.inl index 1da5ceadf2..c6a0aa5938 100644 --- a/include/IECore/OversamplesCalculator.inl +++ b/include/IECore/OversamplesCalculator.inl @@ -32,6 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once #include "IECore/Exception.h" diff --git a/include/IECore/Parameter.h b/include/IECore/Parameter.h index 997b06c6c9..1fec39dd58 100644 --- a/include/IECore/Parameter.h +++ b/include/IECore/Parameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_PARAMETER_H -#define IE_CORE_PARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/Object.h" @@ -205,4 +204,3 @@ IE_CORE_DECLAREPTR( Parameter ); #include "IECore/Parameter.inl" -#endif // IE_CORE_PARAMETER_H diff --git a/include/IECore/Parameter.inl b/include/IECore/Parameter.inl index 5646815079..f0b6cb9184 100644 --- a/include/IECore/Parameter.inl +++ b/include/IECore/Parameter.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_PARAMETER_INL -#define IE_CORE_PARAMETER_INL +#pragma once #include "IECore/Parameter.h" @@ -70,5 +69,3 @@ const T *Parameter::getTypedValidatedValue() const } } // namespace IECore - -#endif // IE_CORE_PARAMETER_INL diff --git a/include/IECore/Parameterised.h b/include/IECore/Parameterised.h index f556eede8d..06b02b1679 100644 --- a/include/IECore/Parameterised.h +++ b/include/IECore/Parameterised.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_PARAMETERISED_H -#define IE_CORE_PARAMETERISED_H +#pragma once #include "IECore/Export.h" #include "IECore/ParameterisedInterface.h" @@ -88,4 +87,3 @@ IE_CORE_DECLAREPTR( Parameterised ); } // namespace IECore -#endif // IE_CORE_PARAMETERISED_H diff --git a/include/IECore/ParameterisedInterface.h b/include/IECore/ParameterisedInterface.h index 68aebf1d35..9d6a777e54 100644 --- a/include/IECore/ParameterisedInterface.h +++ b/include/IECore/ParameterisedInterface.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_PARAMETERISEDINTERFACE_H -#define IE_CORE_PARAMETERISEDINTERFACE_H +#pragma once #include "IECore/Export.h" #include "IECore/RefCounted.h" @@ -62,4 +61,3 @@ class IECORE_API ParameterisedInterface } // namespace IECore -#endif // IE_CORE_PARAMETERISEDINTERFACE_H diff --git a/include/IECore/PathMatcher.h b/include/IECore/PathMatcher.h index 5f039dd59e..888b76b881 100644 --- a/include/IECore/PathMatcher.h +++ b/include/IECore/PathMatcher.h @@ -35,8 +35,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_PATHMATCHER_H -#define IECORE_PATHMATCHER_H +#pragma once #include "IECore/InternedString.h" #include "IECore/MurmurHash.h" @@ -355,4 +354,3 @@ IECORE_API void murmurHashAppend( IECore::MurmurHash &h, const IECore::PathMatch #include "IECore/PathMatcher.inl" -#endif // IECORE_PATHMATCHER_H diff --git a/include/IECore/PathMatcher.inl b/include/IECore/PathMatcher.inl index b046eb7372..5d2b729447 100644 --- a/include/IECore/PathMatcher.inl +++ b/include/IECore/PathMatcher.inl @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_PATHMATCHER_INL -#define IECORE_PATHMATCHER_INL +#pragma once namespace IECore { @@ -241,5 +240,3 @@ inline void PathMatcher::Iterator::satisfyTerminatorRequirement() } } // namespace IECore - -#endif // IECORE_PATHMATCHER_INL diff --git a/include/IECore/PathMatcherData.h b/include/IECore/PathMatcherData.h index a690da93f9..477f4bc6e9 100644 --- a/include/IECore/PathMatcherData.h +++ b/include/IECore/PathMatcherData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_PATHMATCHERDATA_H -#define IECORE_PATHMATCHERDATA_H +#pragma once #include "IECore/PathMatcher.h" #include "IECore/TypedData.h" @@ -45,4 +44,3 @@ IECORE_DECLARE_TYPEDDATA( PathMatcherData, PathMatcher, void, SharedDataHolder ) } // namespace IECore -#endif // IECORE_PATHMATCHERDATA_H diff --git a/include/IECore/PathParameter.h b/include/IECore/PathParameter.h index e73c563f84..63235d076d 100644 --- a/include/IECore/PathParameter.h +++ b/include/IECore/PathParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_PATHPARAMETER_H -#define IE_CORE_PATHPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/SimpleTypedParameter.h" @@ -82,4 +81,3 @@ IE_CORE_DECLAREPTR( PathParameter ) } // namespace IECore -#endif // IE_CORE_PATHPARAMETER_H diff --git a/include/IECore/PathVectorParameter.h b/include/IECore/PathVectorParameter.h index 90bf6285f8..626b5feab6 100644 --- a/include/IECore/PathVectorParameter.h +++ b/include/IECore/PathVectorParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_PATHVECTORPARAMETER_H -#define IE_CORE_PATHVECTORPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/VectorTypedParameter.h" @@ -87,4 +86,3 @@ IE_CORE_DECLAREPTR( PathVectorParameter ) } // namespace IECore -#endif // IE_CORE_PATHVECTORPARAMETER_H diff --git a/include/IECore/PointDistribution.h b/include/IECore/PointDistribution.h index ab713ab9aa..d5bed7e751 100644 --- a/include/IECore/PointDistribution.h +++ b/include/IECore/PointDistribution.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_POINTDISTRIBUTION_H -#define IECORE_POINTDISTRIBUTION_H +#pragma once #include "IECore/Export.h" @@ -122,4 +121,3 @@ class IECORE_API PointDistribution : public boost::noncopyable #include "IECore/PointDistribution.inl" -#endif // IECORE_POINTDISTRIBUTION_H diff --git a/include/IECore/PointDistribution.inl b/include/IECore/PointDistribution.inl index 8af0e35d54..8da691036d 100644 --- a/include/IECore/PointDistribution.inl +++ b/include/IECore/PointDistribution.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_POINTDISTRIBUTION_INL -#define IECORE_POINTDISTRIBUTION_INL +#pragma once #include "IECore/FastFloat.h" @@ -183,5 +182,3 @@ inline unsigned int PointDistribution::hash( int x, int y ) const } } // namespace IECore - -#endif // IECORE_POINTDISTRIBUTION_INL diff --git a/include/IECore/PolygonAlgo.h b/include/IECore/PolygonAlgo.h index 13460a37fc..63760fd806 100644 --- a/include/IECore/PolygonAlgo.h +++ b/include/IECore/PolygonAlgo.h @@ -36,8 +36,7 @@ /// Defines algorithms for operating on polygons. /// \ingroup mathGroup -#ifndef IECORE_POLYGONALGO_H -#define IECORE_POLYGONALGO_H +#pragma once #include "IECore/Export.h" @@ -91,4 +90,3 @@ typename std::iterator_traits::value_type::BaseType polygonArea( Itera #include "IECore/PolygonAlgo.inl" -#endif // IECORE_POLYGONALGO_H diff --git a/include/IECore/PolygonAlgo.inl b/include/IECore/PolygonAlgo.inl index 4519d121d6..a723a93277 100644 --- a/include/IECore/PolygonAlgo.inl +++ b/include/IECore/PolygonAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_POLYGONALGO_INL -#define IECORE_POLYGONALGO_INL +#pragma once #include "IECore/CircularIterator.h" @@ -124,5 +123,3 @@ typename std::iterator_traits::value_type::BaseType polygonArea( Itera } } // namespace IECore - -#endif // IECORE_POLYGONALGO_INL diff --git a/include/IECore/QuatAlgo.h b/include/IECore/QuatAlgo.h index 8d6e4521b4..43409a8553 100644 --- a/include/IECore/QuatAlgo.h +++ b/include/IECore/QuatAlgo.h @@ -36,8 +36,7 @@ /// Defines algorithms for quaternions. /// \ingroup mathGroup -#ifndef IECORE_QUATALGO_H -#define IECORE_QUATALGO_H +#pragma once #include "IECore/Export.h" @@ -82,4 +81,3 @@ slerpShortestArc (const Imath::Quat &q1, const Imath::Quat &q2, T t) } // namespace IECore -#endif // IECORE_QUATALGO_H diff --git a/include/IECore/QuatInterpolator.inl b/include/IECore/QuatInterpolator.inl index 28da875e9f..4670670cab 100644 --- a/include/IECore/QuatInterpolator.inl +++ b/include/IECore/QuatInterpolator.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/Export.h" #include "IECore/QuatAlgo.h" diff --git a/include/IECore/Ramp.h b/include/IECore/Ramp.h index 3d0ae98462..eb65eb6214 100644 --- a/include/IECore/Ramp.h +++ b/include/IECore/Ramp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_RAMP_H -#define IECORE_RAMP_H +#pragma once #include "IECore/Export.h" #include "IECore/Spline.h" @@ -143,4 +142,3 @@ inline void murmurHashAppend( IECore::MurmurHash &h, const Ramp &data ) } // namespace IECore -#endif // IECORE_RAMP_H diff --git a/include/IECore/RampData.h b/include/IECore/RampData.h index b684b68927..fa5706ef2f 100644 --- a/include/IECore/RampData.h +++ b/include/IECore/RampData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_RAMPDATA_H -#define IECORE_RAMPDATA_H +#pragma once #include "IECore/Ramp.h" #include "IECore/TypedData.h" @@ -49,4 +48,3 @@ IECORE_DECLARE_TYPEDDATA( RampfColor4fData, RampfColor4f, void, SharedDataHolder } -#endif // IECORE_RAMPDATA_H diff --git a/include/IECore/RandomAlgo.h b/include/IECore/RandomAlgo.h index 8176cd5211..998615f692 100644 --- a/include/IECore/RandomAlgo.h +++ b/include/IECore/RandomAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_RANDOMALGO_H -#define IECORE_RANDOMALGO_H +#pragma once #include "Imath/ImathRandom.h" @@ -62,4 +61,3 @@ Vec cosineHemisphereRand( Rand &rand ); #include "IECore/RandomAlgo.inl" -#endif // IECORE_RANDOMALGO_H diff --git a/include/IECore/RandomAlgo.inl b/include/IECore/RandomAlgo.inl index 72332aaa2d..e9db00c490 100644 --- a/include/IECore/RandomAlgo.inl +++ b/include/IECore/RandomAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_RANDOMALGO_INL -#define IECORE_RANDOMALGO_INL +#pragma once #include "IECore/Export.h" @@ -85,5 +84,3 @@ Vec cosineHemisphereRand( Rand &rand ) } // namespace RandomAlgo } // namespace IECore - -#endif // IECORE_RANDOMALGO_INL diff --git a/include/IECore/RandomRotationOp.h b/include/IECore/RandomRotationOp.h index 99ec484752..82d05a4a66 100644 --- a/include/IECore/RandomRotationOp.h +++ b/include/IECore/RandomRotationOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_RANDOMROTATIONOP_H -#define IE_CORE_RANDOMROTATIONOP_H +#pragma once #include "IECore/Export.h" #include "IECore/NumericParameter.h" @@ -98,4 +97,3 @@ IE_CORE_DECLAREPTR( RandomRotationOp ); #include "IECore/RandomRotationOp.inl" -#endif // IE_CORE_RANDOMROTATIONOP_H diff --git a/include/IECore/RandomRotationOp.inl b/include/IECore/RandomRotationOp.inl index 5f59391f4d..afeb909830 100644 --- a/include/IECore/RandomRotationOp.inl +++ b/include/IECore/RandomRotationOp.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_RANDOMROTATIONOP_H -#define IECORE_RANDOMROTATIONOP_H +#pragma once #include "IECore/Export.h" #include "IECore/Math.h" @@ -76,4 +75,3 @@ void RandomRotationOp::generate( } // namespace IECore -#endif // IECORE_RANDOMROTATIONOP_H diff --git a/include/IECore/Reader.h b/include/IECore/Reader.h index 80eadb52fa..adbf922eb5 100644 --- a/include/IECore/Reader.h +++ b/include/IECore/Reader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_READER_H -#define IE_CORE_READER_H +#pragma once #include "IECore/CompoundObject.h" #include "IECore/Export.h" @@ -154,4 +153,3 @@ class IECORE_API Reader : public Op #include "IECore/Reader.inl" -#endif // IE_CORE_READER_H diff --git a/include/IECore/Reader.inl b/include/IECore/Reader.inl index 55d3dfc2ef..43c1026538 100644 --- a/include/IECore/Reader.inl +++ b/include/IECore/Reader.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_READER_INL -#define IE_CORE_READER_INL +#pragma once namespace IECore { @@ -51,5 +50,3 @@ ReaderPtr Reader::ReaderDescription::creator( const std::string &fileName ) } } // namespace IECore - -#endif // IE_CORE_READER_INL diff --git a/include/IECore/RefCounted.h b/include/IECore/RefCounted.h index 068f3cf3c6..f1d48c71b7 100644 --- a/include/IECore/RefCounted.h +++ b/include/IECore/RefCounted.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_REFCOUNTED_H -#define IE_CORE_REFCOUNTED_H +#pragma once #include "IECore/Export.h" @@ -186,4 +185,3 @@ inline size_t tbb_hasher( const boost::intrusive_ptr &ptr ) } // namespace IECore -#endif // IE_CORE_REFCOUNTED_H diff --git a/include/IECore/ReorderedFrameList.h b/include/IECore/ReorderedFrameList.h index f1794e94ea..4ed5ed9af8 100644 --- a/include/IECore/ReorderedFrameList.h +++ b/include/IECore/ReorderedFrameList.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_REORDEREDFRAMELIST_H -#define IE_CORE_REORDEREDFRAMELIST_H +#pragma once #include "IECore/Export.h" #include "IECore/FrameList.h" @@ -77,4 +76,3 @@ IE_CORE_DECLAREPTR( ReorderedFrameList ); #include "IECore/ReorderedFrameList.inl" -#endif // IE_CORE_REORDEREDFRAMELIST_H diff --git a/include/IECore/ReorderedFrameList.inl b/include/IECore/ReorderedFrameList.inl index 9aa2a854a4..e4602aa29e 100644 --- a/include/IECore/ReorderedFrameList.inl +++ b/include/IECore/ReorderedFrameList.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_REORDEREDFRAMELIST_INL -#define IE_CORE_REORDEREDFRAMELIST_INL +#pragma once #include @@ -62,5 +61,3 @@ FrameListPtr ReorderedFrameList::parseForChildList( const std::string &frameList } } // namespace IECore - -#endif // IE_CORE_REORDEREDFRAMELIST_INL diff --git a/include/IECore/ReversedFrameList.h b/include/IECore/ReversedFrameList.h index a369f42e2a..c36f3e7896 100644 --- a/include/IECore/ReversedFrameList.h +++ b/include/IECore/ReversedFrameList.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_REVERSEDFRAMELIST_H -#define IE_CORE_REVERSEDFRAMELIST_H +#pragma once #include "IECore/Export.h" #include "IECore/ReorderedFrameList.h" @@ -75,4 +74,3 @@ IE_CORE_DECLAREPTR( ReversedFrameList ); } // namespace IECore -#endif // IE_CORE_REVERSEDFRAMELIST_H diff --git a/include/IECore/RunTimeTyped.h b/include/IECore/RunTimeTyped.h index 9b8ecbccfa..0315607041 100644 --- a/include/IECore/RunTimeTyped.h +++ b/include/IECore/RunTimeTyped.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_RUNTIMETYPED_H -#define IE_CORE_RUNTIMETYPED_H +#pragma once #include "IECore/Export.h" #include "IECore/RefCounted.h" @@ -358,4 +357,3 @@ inline T* assertedStaticCast( S* src ); #include "IECore/RunTimeTyped.inl" -#endif // IE_CORE_RUNTIMETYPED_H diff --git a/include/IECore/RunTimeTyped.inl b/include/IECore/RunTimeTyped.inl index 584942bbd4..e4af882127 100644 --- a/include/IECore/RunTimeTyped.inl +++ b/include/IECore/RunTimeTyped.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_RUNTIMETYPED_INL -#define IE_CORE_RUNTIMETYPED_INL +#pragma once #include @@ -89,5 +88,3 @@ RunTimeTyped::TypeDescription::TypeDescription() }; } // namespace IECore - -#endif // IE_CORE_RUNTIMETYPED_INL diff --git a/include/IECore/ScaledDataConversion.h b/include/IECore/ScaledDataConversion.h index 862b4c3dd3..74589767ac 100644 --- a/include/IECore/ScaledDataConversion.h +++ b/include/IECore/ScaledDataConversion.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_SCALEDDATACONVERSION_H -#define IE_CORE_SCALEDDATACONVERSION_H +#pragma once #include "IECore/DataConversion.h" @@ -62,4 +61,3 @@ struct ScaledDataConversion : public DataConversion< F, T > #include "ScaledDataConversion.inl" -#endif // IE_CORE_SCALEDDATACONVERSION_H diff --git a/include/IECore/ScaledDataConversion.inl b/include/IECore/ScaledDataConversion.inl index bde09aee20..a450f45de1 100644 --- a/include/IECore/ScaledDataConversion.inl +++ b/include/IECore/ScaledDataConversion.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/DataConversion.h" #include "IECore/HalfTypeTraits.h" diff --git a/include/IECore/SearchPath.h b/include/IECore/SearchPath.h index 34043e44de..cbea256ea7 100644 --- a/include/IECore/SearchPath.h +++ b/include/IECore/SearchPath.h @@ -37,8 +37,7 @@ #undef SearchPath #endif -#ifndef IE_CORE_SEARCHPATH_H -#define IE_CORE_SEARCHPATH_H +#pragma once #include "IECore/Export.h" @@ -89,4 +88,3 @@ class IECORE_API SearchPath } // namespace IECore -#endif // IE_CORE_SEARCHPATH_H diff --git a/include/IECore/SimpleTypedData.h b/include/IECore/SimpleTypedData.h index c8e0af8e3c..9a5ba46871 100644 --- a/include/IECore/SimpleTypedData.h +++ b/include/IECore/SimpleTypedData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_SIMPLETYPEDDATA_H -#define IECORE_SIMPLETYPEDDATA_H +#pragma once #include "IECore/Export.h" #include "IECore/GeometricTypedData.h" @@ -138,4 +137,3 @@ extern template class TypedData; } // namespace IECore -#endif // IECORE_SIMPLETYPEDDATA_H diff --git a/include/IECore/SimpleTypedParameter.h b/include/IECore/SimpleTypedParameter.h index f3610c2d52..16d1f0e2d9 100644 --- a/include/IECore/SimpleTypedParameter.h +++ b/include/IECore/SimpleTypedParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_SIMPLETYPEDPARAMETER_H -#define IE_CORE_SIMPLETYPEDPARAMETER_H +#pragma once #include "IECore/SimpleTypedData.h" #include "IECore/TransformationMatrix.h" @@ -92,4 +91,3 @@ IE_CORE_DECLAREPTR( LineSegment3dParameter ); } -#endif // IE_CORE_SIMPLETYPEDPARAMETER_H diff --git a/include/IECore/SpaceTransform.h b/include/IECore/SpaceTransform.h index 41ae67afb0..f276511578 100644 --- a/include/IECore/SpaceTransform.h +++ b/include/IECore/SpaceTransform.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_SPACETRANSFORM_H -#define IE_CORE_SPACETRANSFORM_H +#pragma once namespace IECore { @@ -63,4 +62,3 @@ struct SpaceTransform } // namespace IECore -#endif // IE_CORE_SPACETRANSFORM_H diff --git a/include/IECore/SphericalToEuclideanTransform.h b/include/IECore/SphericalToEuclideanTransform.h index d51c15b8cd..a7ac759f75 100644 --- a/include/IECore/SphericalToEuclideanTransform.h +++ b/include/IECore/SphericalToEuclideanTransform.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_SPHERICALTOEUCLIDEANTRANSFORM_H -#define IE_CORE_SPHERICALTOEUCLIDEANTRANSFORM_H +#pragma once #include "IECore/SpaceTransform.h" #include "IECore/TypeTraits.h" @@ -75,4 +74,3 @@ typedef SphericalToEuclideanTransform SphericalToEuclide #include "IECore/SphericalToEuclideanTransform.inl" -#endif // IE_CORE_SPHERICALTOEUCLIDEANTRANSFORM_H diff --git a/include/IECore/SphericalToEuclideanTransform.inl b/include/IECore/SphericalToEuclideanTransform.inl index 427ad712a4..a8c13e986b 100644 --- a/include/IECore/SphericalToEuclideanTransform.inl +++ b/include/IECore/SphericalToEuclideanTransform.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_SPHERICALTOEUCLIDEANTRANSFORM_INL -#define IE_CORE_SPHERICALTOEUCLIDEANTRANSFORM_INL +#pragma once #include "IECore/Export.h" #include "IECore/VectorTraits.h" @@ -75,5 +74,3 @@ typename SphericalToEuclideanTransform::InverseType SphericalToEuclideanTr } // namespace IECore -#endif // IE_CORE_SPHERICALTOEUCLIDEANTRANSFORM_INL - diff --git a/include/IECore/Spline.h b/include/IECore/Spline.h index 1900a9568d..4236fb6445 100644 --- a/include/IECore/Spline.h +++ b/include/IECore/Spline.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_SPLINE_H -#define IECORE_SPLINE_H +#pragma once #include "IECore/CubicBasis.h" #include "IECore/Export.h" @@ -123,4 +122,3 @@ inline void murmurHashAppend( IECore::MurmurHash &h, const Spline &data ); #include "IECore/Spline.inl" -#endif // IECORE_SPLINE_H diff --git a/include/IECore/Spline.inl b/include/IECore/Spline.inl index d9dd4e5f40..e4f64ca038 100644 --- a/include/IECore/Spline.inl +++ b/include/IECore/Spline.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_SPLINE_INL -#define IECORE_SPLINE_INL +#pragma once #include "IECore/Exception.h" @@ -400,5 +399,3 @@ inline void murmurHashAppend( IECore::MurmurHash &h, const Spline &data ) } } // namespace IECore - -#endif // IECORE_SPLINE_INL diff --git a/include/IECore/SplineData.h b/include/IECore/SplineData.h index 96aa7aa2ef..640551c75f 100644 --- a/include/IECore/SplineData.h +++ b/include/IECore/SplineData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_SPLINEDATA_H -#define IECORE_SPLINEDATA_H +#pragma once #include "IECore/Spline.h" #include "IECore/TypedData.h" @@ -50,4 +49,3 @@ IECORE_DECLARE_TYPEDDATA( SplinefColor4fData, SplinefColor4f, void, SharedDataHo } -#endif // IECORE_SPLINEDATA_H diff --git a/include/IECore/SplineParameter.h b/include/IECore/SplineParameter.h index f490e8a8b2..baa3aa2b91 100644 --- a/include/IECore/SplineParameter.h +++ b/include/IECore/SplineParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_SPLINEPARAMETER_H -#define IE_CORE_SPLINEPARAMETER_H +#pragma once #include "IECore/SplineData.h" #include "IECore/TypedParameter.h" @@ -59,4 +58,3 @@ IE_CORE_DECLAREPTR( SplinefColor4fParameter ); } -#endif // IE_CORE_SPLINEPARAMETER_H diff --git a/include/IECore/StandardRadialLensModel.h b/include/IECore/StandardRadialLensModel.h index 9fa487fcc1..9cca03b472 100644 --- a/include/IECore/StandardRadialLensModel.h +++ b/include/IECore/StandardRadialLensModel.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_STANDARDRADIALLENSMODEL_H -#define IECORE_STANDARDRADIALLENSMODEL_H +#pragma once #include "IECore/Export.h" #include "IECore/LensModel.h" @@ -103,5 +102,4 @@ IE_CORE_DECLAREPTR( StandardRadialLensModel ); } // namespace IECore -#endif // IECORE_STANDARDRADIALLENSMODEL_H diff --git a/include/IECore/StreamIndexedIO.h b/include/IECore/StreamIndexedIO.h index 916bc8bf6e..24d7be732f 100644 --- a/include/IECore/StreamIndexedIO.h +++ b/include/IECore/StreamIndexedIO.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_STREAMINDEXEDIO_H -#define IE_CORE_STREAMINDEXEDIO_H +#pragma once #include "IECore/Exception.h" #include "IECore/Export.h" @@ -287,4 +286,3 @@ IE_CORE_DECLAREPTR( StreamIndexedIO ) } -#endif // IE_CORE_STREAMINDEXEDIO_H diff --git a/include/IECore/StringAlgo.h b/include/IECore/StringAlgo.h index b3e26873cf..8aa4320897 100644 --- a/include/IECore/StringAlgo.h +++ b/include/IECore/StringAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_STRINGALGO_H -#define IECORE_STRINGALGO_H +#pragma once #include "IECore/Export.h" #include "IECore/InternedString.h" @@ -195,4 +194,3 @@ std::string concat( StringsFoldType const& ... strs); #include "IECore/StringAlgo.inl" -#endif // IECORE_STRINGALGO_H diff --git a/include/IECore/StringAlgo.inl b/include/IECore/StringAlgo.inl index 24c746bb54..2578422f9c 100644 --- a/include/IECore/StringAlgo.inl +++ b/include/IECore/StringAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_STRINGALGO_INL -#define IECORE_STRINGALGO_INL +#pragma once #include "IECore/Exception.h" @@ -363,5 +362,3 @@ std::string concat( StringsFoldType const& ... strs ) } // namespace StringAlgo } // namespace IECore - -#endif // IECORE_STRINGALGO_INL diff --git a/include/IECore/TestTypedData.h b/include/IECore/TestTypedData.h index d468a1f8f2..7dd5fa518a 100644 --- a/include/IECore/TestTypedData.h +++ b/include/IECore/TestTypedData.h @@ -33,8 +33,7 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TESTTYPEDDATA_H -#define IE_CORE_TESTTYPEDDATA_H +#pragma once #include "IECore/Data.h" @@ -51,4 +50,3 @@ bool testTypedData( const Data *data ); #include "IECore/TestTypedData.inl" -#endif // IE_CORE_TESTTYPEDDATA_H diff --git a/include/IECore/TestTypedData.inl b/include/IECore/TestTypedData.inl index 0625676c0a..a8ddf6090d 100644 --- a/include/IECore/TestTypedData.inl +++ b/include/IECore/TestTypedData.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TESTTYPEDDATA_INL -#define IE_CORE_TESTTYPEDDATA_INL +#pragma once #include "IECore/DespatchTypedData.h" @@ -64,5 +63,3 @@ bool testTypedData( const Data *data ) } } - -#endif // IE_CORE_TESTTYPEDDATA_INL diff --git a/include/IECore/TetrahedronAlgo.h b/include/IECore/TetrahedronAlgo.h index 9e558b0a6e..f3bbafeb59 100644 --- a/include/IECore/TetrahedronAlgo.h +++ b/include/IECore/TetrahedronAlgo.h @@ -36,8 +36,7 @@ /// Defines for operating on tetrahedra. /// \ingroup mathGroup -#ifndef IECORE_TETRAHEDRONALGO_H -#define IECORE_TETRAHEDRONALGO_H +#pragma once #include "IECore/Export.h" #include "IECore/VectorTraits.h" @@ -95,4 +94,3 @@ IECORE_API inline Imath::V3i tetrahedronFaceIndices(int face); #include "IECore/TetrahedronAlgo.inl" -#endif // IECORE_TETRAHEDRONALGO_H diff --git a/include/IECore/TetrahedronAlgo.inl b/include/IECore/TetrahedronAlgo.inl index 2cdf59c002..b0f092c347 100644 --- a/include/IECore/TetrahedronAlgo.inl +++ b/include/IECore/TetrahedronAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_TETRAHEDRONALGO_INL -#define IECORE_TETRAHEDRONALGO_INL +#pragma once #include "IECore/TriangleAlgo.h" #include "IECore/VectorOps.h" @@ -185,6 +184,4 @@ inline Imath::V3i tetrahedronFaceIndices( int face ) } // namespace IECore -#endif // IECORE_TETRAHEDRONALGO_INL - diff --git a/include/IECore/TimeCodeData.h b/include/IECore/TimeCodeData.h index c0ca1c31ef..d3388cbece 100644 --- a/include/IECore/TimeCodeData.h +++ b/include/IECore/TimeCodeData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_TIMECODEDATA_H -#define IECORE_TIMECODEDATA_H +#pragma once #include "IECore/Export.h" #include "IECore/TypedData.h" @@ -50,4 +49,3 @@ IECORE_DECLARE_TYPEDDATA( TimeCodeData, Imf::TimeCode, unsigned int, SimpleDataH } // namespace IECore -#endif // IECORE_TIMECODEDATA_H diff --git a/include/IECore/Timer.h b/include/IECore/Timer.h index ec1c47ce39..d48155ea3e 100644 --- a/include/IECore/Timer.h +++ b/include/IECore/Timer.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TIMER_H -#define IE_CORE_TIMER_H +#pragma once #include "IECore/Export.h" @@ -103,4 +102,3 @@ class IECORE_API ScopedTimer } // namespace IECore -#endif // IE_CORE_TIMER_H diff --git a/include/IECore/ToCoreConverter.h b/include/IECore/ToCoreConverter.h index 2726de1b5e..dff0ad3d86 100644 --- a/include/IECore/ToCoreConverter.h +++ b/include/IECore/ToCoreConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_TOCORECONVERTER_H -#define IECORE_TOCORECONVERTER_H +#pragma once #include "IECore/Converter.h" #include "IECore/Export.h" @@ -74,4 +73,3 @@ IE_CORE_DECLAREPTR( ToCoreConverter ); } // namespace IECore -#endif // IECORE_TOCORECONVERTER_H diff --git a/include/IECore/TransformationMatrix.h b/include/IECore/TransformationMatrix.h index d45fe730c5..ee232ae871 100644 --- a/include/IECore/TransformationMatrix.h +++ b/include/IECore/TransformationMatrix.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TRANSFORMATIONMATRIX_H -#define IE_CORE_TRANSFORMATIONMATRIX_H +#pragma once #include "IECore/Export.h" #include "IECore/MurmurHash.h" @@ -100,4 +99,3 @@ typedef TransformationMatrix TransformationMatrixf; #include "IECore/TransformationMatrix.inl" -#endif // IE_CORE_TRANSFORMATIONMATRIX_H diff --git a/include/IECore/TransformationMatrix.inl b/include/IECore/TransformationMatrix.inl index c1a3696dbc..86bd308426 100644 --- a/include/IECore/TransformationMatrix.inl +++ b/include/IECore/TransformationMatrix.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TRANSFORMATIONMATRIX_INL -#define IE_CORE_TRANSFORMATIONMATRIX_INL +#pragma once namespace IECore { @@ -88,5 +87,3 @@ inline void murmurHashAppend( IECore::MurmurHash &h, const TransformationMatrix< } } // namespace IECore - -#endif // IE_CORE_TRANSFORMATIONMATRIX_INL diff --git a/include/IECore/TransformationMatrixData.h b/include/IECore/TransformationMatrixData.h index a18bc0a770..8b988df873 100644 --- a/include/IECore/TransformationMatrixData.h +++ b/include/IECore/TransformationMatrixData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TRANSFORMATIONMATRIXDATA_H -#define IE_CORE_TRANSFORMATIONMATRIXDATA_H +#pragma once #include "IECore/TransformationMatrix.h" #include "IECore/TypedData.h" @@ -47,4 +46,3 @@ IECORE_DECLARE_TYPEDDATA( TransformationMatrixdData, TransformationMatrixd, doub } -#endif // IE_CORE_TRANSFORMATIONMATRIXDATA_H diff --git a/include/IECore/TransformationMatrixInterpolator.inl b/include/IECore/TransformationMatrixInterpolator.inl index e911edaf3e..d59e827982 100644 --- a/include/IECore/TransformationMatrixInterpolator.inl +++ b/include/IECore/TransformationMatrixInterpolator.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/TransformationMatrix.h" namespace IECore diff --git a/include/IECore/TriangleAlgo.h b/include/IECore/TriangleAlgo.h index 8b5a151d3a..22c5679e63 100644 --- a/include/IECore/TriangleAlgo.h +++ b/include/IECore/TriangleAlgo.h @@ -36,8 +36,7 @@ /// Defines for operating on triangles. /// \ingroup mathGroup -#ifndef IECORE_TRIANGLEALGO_H -#define IECORE_TRIANGLEALGO_H +#pragma once #include "IECore/Export.h" #include "IECore/VectorTraits.h" @@ -100,4 +99,3 @@ bool triangleRayIntersection( const Vec &v0, const Vec &v1, const Vec &v2, const #include "IECore/TriangleAlgo.inl" -#endif // IECORE_TRIANGLEALGO_H diff --git a/include/IECore/TriangleAlgo.inl b/include/IECore/TriangleAlgo.inl index 73d19d545b..43b26c4aeb 100644 --- a/include/IECore/TriangleAlgo.inl +++ b/include/IECore/TriangleAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_TRIANGLEALGO_INL -#define IECORE_TRIANGLEALGO_INL +#pragma once #include "IECore/VectorOps.h" @@ -410,5 +409,3 @@ bool triangleRayIntersection( const Vec &v0, const Vec &v1, const Vec &v2, const } } // namespace IECore - -#endif // IECORE_TRIANGLEALGO_INL diff --git a/include/IECore/TypeIds.h b/include/IECore/TypeIds.h index 82fb4252b1..c98ff47af2 100644 --- a/include/IECore/TypeIds.h +++ b/include/IECore/TypeIds.h @@ -37,8 +37,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TYPEIDS_H -#define IE_CORE_TYPEIDS_H +#pragma once namespace IECore { @@ -326,4 +325,3 @@ enum TypeId } // namespace IECore -#endif // IE_CORE_TYPEIDS_H diff --git a/include/IECore/TypeTraits.h b/include/IECore/TypeTraits.h index ba311d819c..4ed2e8a3ef 100644 --- a/include/IECore/TypeTraits.h +++ b/include/IECore/TypeTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TYPETRAITS_H -#define IE_CORE_TYPETRAITS_H +#pragma once #include "IECore/DateTimeData.h" #include "IECore/HalfTypeTraits.h" @@ -312,4 +311,3 @@ template<> struct IsStringVectorTypedData< TypedData::setTypedValue( const T &value ) template class TypedParameter; } - -#endif // IE_CORE_TYPEDPARAMETER_INL diff --git a/include/IECore/TypedParameterInternals.h b/include/IECore/TypedParameterInternals.h index 2925e6c29b..7898be71c2 100644 --- a/include/IECore/TypedParameterInternals.h +++ b/include/IECore/TypedParameterInternals.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_TYPEDPARAMETERINTERNALS_H -#define IECORE_TYPEDPARAMETERINTERNALS_H +#pragma once #include "IECore/GeometricTypedData.h" #include "IECore/TypedData.h" @@ -78,4 +77,3 @@ class TypedParameterTraits > > } // namespace IECore -#endif // IECORE_TYPEDPARAMETERINTERNALS_H diff --git a/include/IECore/ValidatedStringParameter.h b/include/IECore/ValidatedStringParameter.h index d1db36d44b..5697022a99 100644 --- a/include/IECore/ValidatedStringParameter.h +++ b/include/IECore/ValidatedStringParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_VALIDATEDSTRINGPARAMETER_H -#define IE_CORE_VALIDATEDSTRINGPARAMETER_H +#pragma once #include "IECore/Export.h" #include "IECore/SimpleTypedParameter.h" @@ -73,4 +72,3 @@ IE_CORE_DECLAREPTR( ValidatedStringParameter ) } // namespace IECore -#endif // IE_CORE_VALIDATEDSTRINGPARAMETER_H diff --git a/include/IECore/VecAlgo.h b/include/IECore/VecAlgo.h index 4baa915232..31858dfd9b 100644 --- a/include/IECore/VecAlgo.h +++ b/include/IECore/VecAlgo.h @@ -36,8 +36,7 @@ /// Defines additional functions for operating on Imath::Vec2 and Imath::Vec3 types. /// \ingroup mathGroup -#ifndef IECORE_VECALGO_H -#define IECORE_VECALGO_H +#pragma once #include "IECore/Export.h" @@ -66,4 +65,3 @@ bool operator < ( const Imath::Vec3 &left, const Imath::Vec3 &right ); #include "IECore/VecAlgo.inl" -#endif // IECORE_VECALGO_H diff --git a/include/IECore/VecAlgo.inl b/include/IECore/VecAlgo.inl index 174948818c..a44b8e2080 100644 --- a/include/IECore/VecAlgo.inl +++ b/include/IECore/VecAlgo.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_VECALGO_INL -#define IECORE_VECALGO_INL +#pragma once #ifdef IMATH_INTERNAL_NAMESPACE namespace IMATH_INTERNAL_NAMESPACE @@ -80,5 +79,3 @@ bool operator < ( const Imath::Vec3 &left, const Imath::Vec3 &right ) } // namespace Imath - -#endif // IECORE_VECALGO_INL diff --git a/include/IECore/VectorDataFilterOp.h b/include/IECore/VectorDataFilterOp.h index 0abfea949a..f17f8d21f5 100644 --- a/include/IECore/VectorDataFilterOp.h +++ b/include/IECore/VectorDataFilterOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_VECTORDATAFILTEROP_H -#define IE_CORE_VECTORDATAFILTEROP_H +#pragma once #include "IECore/Export.h" #include "IECore/ModifyOp.h" @@ -69,4 +68,3 @@ IE_CORE_DECLAREPTR( VectorDataFilterOp ); } // namespace IECore -#endif // IE_CORE_VECTORDATAFILTEROP_H diff --git a/include/IECore/VectorOps.h b/include/IECore/VectorOps.h index 4e47e40165..a63bc4f197 100644 --- a/include/IECore/VectorOps.h +++ b/include/IECore/VectorOps.h @@ -41,8 +41,7 @@ /// give less intuitive syntax but are compatible with any classes for which /// a valid VectorTraits specialisation exists. -#ifndef IE_CORE_VECTOROPS_H -#define IE_CORE_VECTOROPS_H +#pragma once #include "IECore/VectorTraits.h" @@ -168,4 +167,3 @@ inline T vecCross( const T &v1, const T &v2 ); #include "IECore/VectorOps.inl" -#endif // IE_CORE_VECTOROPS_H diff --git a/include/IECore/VectorOps.inl b/include/IECore/VectorOps.inl index f8f3639951..852b1ca5ed 100644 --- a/include/IECore/VectorOps.inl +++ b/include/IECore/VectorOps.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_VECTOROPS_INL -#define IE_CORE_VECTOROPS_INL +#pragma once #include #include @@ -265,5 +264,3 @@ inline T vecCross( const T &v1, const T &v2 ) } // namespace IECore -#endif // IE_CORE_VECTOROPS_INL - diff --git a/include/IECore/VectorTraits.h b/include/IECore/VectorTraits.h index 2392e12c2e..2b5f42efbf 100644 --- a/include/IECore/VectorTraits.h +++ b/include/IECore/VectorTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_VECTORTRAITS_H -#define IE_CORE_VECTORTRAITS_H +#pragma once namespace IECore { @@ -86,4 +85,3 @@ struct VectorTraits } // namespace IECore -#endif // IE_CORE_VECTORTRAITS_H diff --git a/include/IECore/VectorTypedData.h b/include/IECore/VectorTypedData.h index 5c82891b1f..0a05ead683 100644 --- a/include/IECore/VectorTypedData.h +++ b/include/IECore/VectorTypedData.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_VECTORTYPEDDATA_H -#define IECORE_VECTORTYPEDDATA_H +#pragma once #include "IECore/Export.h" #include "IECore/GeometricTypedData.h" @@ -135,4 +134,3 @@ extern template class TypedData>; } // namespace IECore -#endif // IECORE_VECTORTYPEDDATA_H diff --git a/include/IECore/VectorTypedParameter.h b/include/IECore/VectorTypedParameter.h index 4788845787..3d10de9e28 100644 --- a/include/IECore/VectorTypedParameter.h +++ b/include/IECore/VectorTypedParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_VECTORTYPEDPARAMETER_H -#define IE_CORE_VECTORTYPEDPARAMETER_H +#pragma once #include "IECore/TypedParameter.h" #include "IECore/VectorTypedData.h" @@ -89,4 +88,3 @@ IE_CORE_DECLAREPTR( Color4fVectorParameter ); } -#endif // IE_CORE_VECTORTYPEDPARAMETER_H diff --git a/include/IECore/Version.h b/include/IECore/Version.h index 121f8425e8..53db1c7e82 100644 --- a/include/IECore/Version.h +++ b/include/IECore/Version.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_VERSION_H -#define IECORE_VERSION_H +#pragma once #include "IECore/Export.h" @@ -75,4 +74,3 @@ IECORE_API const std::string &versionString(); } // namespace IECore -#endif // IECORE_VERSION_H diff --git a/include/IECore/Writer.h b/include/IECore/Writer.h index e46bf1a153..df564073fa 100644 --- a/include/IECore/Writer.h +++ b/include/IECore/Writer.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_WRITER_H -#define IE_CORE_WRITER_H +#pragma once #include "IECore/Export.h" #include "IECore/FileNameParameter.h" @@ -152,4 +151,3 @@ class IECORE_API Writer : public Op #include "IECore/Writer.inl" -#endif // IE_CORE_WRITER_H diff --git a/include/IECore/Writer.inl b/include/IECore/Writer.inl index 5baded0f21..3849fd08b6 100644 --- a/include/IECore/Writer.inl +++ b/include/IECore/Writer.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_WRITER_INL -#define IE_CORE_WRITER_INL +#pragma once namespace IECore { @@ -51,5 +50,3 @@ WriterPtr Writer::WriterDescription::creator() } } // namespace IECore - -#endif // IE_CORE_WRITER_INL diff --git a/include/IECoreGL/AlphaTexture.h b/include/IECoreGL/AlphaTexture.h index b2e0a485ac..de16e423ab 100644 --- a/include/IECoreGL/AlphaTexture.h +++ b/include/IECoreGL/AlphaTexture.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_ALPHATEXTURE_H -#define IECOREGL_ALPHATEXTURE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Texture.h" @@ -70,4 +69,3 @@ IE_CORE_DECLAREPTR( AlphaTexture ); } // namespace IECoreGL -#endif // IECOREGL_ALPHATEXTURE_H diff --git a/include/IECoreGL/Bindable.h b/include/IECoreGL/Bindable.h index 1bb8114acd..df534c7921 100644 --- a/include/IECoreGL/Bindable.h +++ b/include/IECoreGL/Bindable.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_BINDABLE_H -#define IECOREGL_BINDABLE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/TypeIds.h" @@ -67,4 +66,3 @@ IE_CORE_DECLAREPTR( Bindable ); } // namespace IECoreGL -#endif // IECOREGL_BINDABLE_H diff --git a/include/IECoreGL/BoxPrimitive.h b/include/IECoreGL/BoxPrimitive.h index 14d83d6e3f..4edde3b5e5 100644 --- a/include/IECoreGL/BoxPrimitive.h +++ b/include/IECoreGL/BoxPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_BOXPRIMITIVE_H -#define IECOREGL_BOXPRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Primitive.h" @@ -76,4 +75,3 @@ IE_CORE_DECLAREPTR( BoxPrimitive ); } // namespace IECoreGL -#endif // IECOREGL_BOXPRIMITIVE_H diff --git a/include/IECoreGL/Buffer.h b/include/IECoreGL/Buffer.h index b9297dcb6b..db21b1fa0c 100644 --- a/include/IECoreGL/Buffer.h +++ b/include/IECoreGL/Buffer.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_BUFFER_H -#define IECOREGL_BUFFER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/GL.h" @@ -102,4 +101,3 @@ IE_CORE_DECLAREPTR( Buffer ); } // namespace IECoreGL -#endif // IECOREGL_BUFFER_H diff --git a/include/IECoreGL/CachedConverter.h b/include/IECoreGL/CachedConverter.h index 49e2becff3..b44c4e49bc 100644 --- a/include/IECoreGL/CachedConverter.h +++ b/include/IECoreGL/CachedConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_CACHEDCONVERTER_H -#define IECOREGL_CACHEDCONVERTER_H +#pragma once #include "IECoreGL/Export.h" @@ -93,4 +92,3 @@ class IECOREGL_API CachedConverter : public IECore::RefCounted } // namespace IECoreGL -#endif // IECOREGL_CACHEDCONVERTER_H diff --git a/include/IECoreGL/Camera.h b/include/IECoreGL/Camera.h index 493f7afdbc..abf63676b4 100644 --- a/include/IECoreGL/Camera.h +++ b/include/IECoreGL/Camera.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_CAMERA_H -#define IECOREGL_CAMERA_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Renderable.h" @@ -123,4 +122,3 @@ IE_CORE_DECLAREPTR( Camera ); }; -#endif // IECOREGL_CAMERA_H diff --git a/include/IECoreGL/ColorTexture.h b/include/IECoreGL/ColorTexture.h index f793d0b0cb..292284e84d 100644 --- a/include/IECoreGL/ColorTexture.h +++ b/include/IECoreGL/ColorTexture.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_COLORTEXTURE_H -#define IECOREGL_COLORTEXTURE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Texture.h" @@ -97,4 +96,3 @@ IE_CORE_DECLAREPTR( ColorTexture ); } // namespace IECoreGL -#endif // IECOREGL_COLORTEXTURE_H diff --git a/include/IECoreGL/CurvesPrimitive.h b/include/IECoreGL/CurvesPrimitive.h index 0f64690b26..af8242b321 100644 --- a/include/IECoreGL/CurvesPrimitive.h +++ b/include/IECoreGL/CurvesPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_CURVESPRIMITIVE_H -#define IECOREGL_CURVESPRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Primitive.h" @@ -106,4 +105,3 @@ IE_CORE_DECLAREPTR( CurvesPrimitive ); } // namespace IECoreGL -#endif // IECOREGL_CURVESPRIMITIVE_H diff --git a/include/IECoreGL/Debug.h b/include/IECoreGL/Debug.h index 4d1e724573..5ec97241ca 100644 --- a/include/IECoreGL/Debug.h +++ b/include/IECoreGL/Debug.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_DEBUG_H -#define IECOREGL_DEBUG_H +#pragma once #include "IECoreGL/Export.h" @@ -54,4 +53,3 @@ IECOREGL_API void debugPrintErrors( const char *file, int line ); } // namespace IECoreGL -#endif // IECOREGL_DEBUG_H diff --git a/include/IECoreGL/DepthTexture.h b/include/IECoreGL/DepthTexture.h index 5d067dc625..eacb2bb5fa 100644 --- a/include/IECoreGL/DepthTexture.h +++ b/include/IECoreGL/DepthTexture.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_DEPTHTEXTURE_H -#define IECOREGL_DEPTHTEXTURE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Texture.h" @@ -62,4 +61,3 @@ IE_CORE_DECLAREPTR( DepthTexture ); } // namespace IECoreGL -#endif // IECOREGL_DEPTHTEXTURE_H diff --git a/include/IECoreGL/DiskPrimitive.h b/include/IECoreGL/DiskPrimitive.h index b374a71088..c36188bc13 100644 --- a/include/IECoreGL/DiskPrimitive.h +++ b/include/IECoreGL/DiskPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_DISKPRIMITIVE_H -#define IECOREGL_DISKPRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Primitive.h" @@ -69,4 +68,3 @@ IE_CORE_DECLAREPTR( DiskPrimitive ); } // namespace IECoreGL -#endif // IECOREGL_DISKPRIMITIVE_H diff --git a/include/IECoreGL/Exception.h b/include/IECoreGL/Exception.h index f4727e9c5a..cd0662ba54 100644 --- a/include/IECoreGL/Exception.h +++ b/include/IECoreGL/Exception.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_EXCEPTION_H -#define IECOREGL_EXCEPTION_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/GL.h" @@ -67,4 +66,3 @@ class IECOREGL_API Exception : public IECore::Exception } // namespace IECoreGL -#endif // IECOREGL_EXCEPTION_H diff --git a/include/IECoreGL/Export.h b/include/IECoreGL/Export.h index ebb391ed90..c76102d25a 100644 --- a/include/IECoreGL/Export.h +++ b/include/IECoreGL/Export.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_EXPORT_H -#define IECOREGL_EXPORT_H +#pragma once #include "IECore/Export.h" @@ -46,5 +45,3 @@ #else #define IECOREGL_API IECORE_IMPORT #endif - -#endif // #ifndef IECOREGL_EXPORT_H diff --git a/include/IECoreGL/Font.h b/include/IECoreGL/Font.h index 79aa731dbf..2591562a5a 100644 --- a/include/IECoreGL/Font.h +++ b/include/IECoreGL/Font.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_FONT_H -#define IECOREGL_FONT_H +#pragma once #include "IECoreGL/AlphaTexture.h" #include "IECoreGL/Export.h" @@ -85,4 +84,3 @@ IE_CORE_DECLAREPTR( Font ); } // namespace IECoreGL -#endif // IECOREGL_FONT_H diff --git a/include/IECoreGL/FontLoader.h b/include/IECoreGL/FontLoader.h index 6f38ced9a0..1b16d6ce2c 100644 --- a/include/IECoreGL/FontLoader.h +++ b/include/IECoreGL/FontLoader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_FONTLOADER_H -#define IECOREGL_FONTLOADER_H +#pragma once #include "IECoreGL/Export.h" @@ -81,4 +80,3 @@ class IECOREGL_API FontLoader : public IECore::RefCounted } // namespace IECoreGL -#endif // IECOREGL_FONTLOADER_H diff --git a/include/IECoreGL/FrameBuffer.h b/include/IECoreGL/FrameBuffer.h index c71349cf77..b82405b4c1 100644 --- a/include/IECoreGL/FrameBuffer.h +++ b/include/IECoreGL/FrameBuffer.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_FRAMEBUFFER_H -#define IECOREGL_FRAMEBUFFER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/GL.h" @@ -128,4 +127,3 @@ IE_CORE_DECLAREPTR( FrameBuffer ); } // namespace IECoreGL -#endif // IECOREGL_FRAMEBUFFER_H diff --git a/include/IECoreGL/GL.h b/include/IECoreGL/GL.h index 195a9391db..40ae64c2e6 100644 --- a/include/IECoreGL/GL.h +++ b/include/IECoreGL/GL.h @@ -36,8 +36,7 @@ /// Include this file to include the system OpenGL headers. It's better this way as the /// right way of including OpenGL varies from system to system. -#ifndef IECOREGL_GL_H -#define IECOREGL_GL_H +#pragma once #include "IECoreGL/Export.h" @@ -80,4 +79,3 @@ class IECOREGL_API PushAttrib #include "IECoreGL/GL.inl" -#endif // IECOREGL_GL_H diff --git a/include/IECoreGL/GL.inl b/include/IECoreGL/GL.inl index 14e969773b..883efccb3e 100644 --- a/include/IECoreGL/GL.inl +++ b/include/IECoreGL/GL.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_GL_INL -#define IECOREGL_GL_INL +#pragma once namespace IECoreGL { @@ -69,5 +68,3 @@ inline void glTranslate( const Imath::V3f &t ) } } // namespace IECoreGL - -#endif // IECOREGL_GL_INL diff --git a/include/IECoreGL/Group.h b/include/IECoreGL/Group.h index 9fb38e28e0..be702f450d 100644 --- a/include/IECoreGL/Group.h +++ b/include/IECoreGL/Group.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_GROUP_H -#define IECOREGL_GROUP_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Renderable.h" @@ -104,4 +103,3 @@ IE_CORE_DECLAREPTR( Group ); } // namespace IECoreGL -#endif // IECOREGL_GROUP_H diff --git a/include/IECoreGL/HitRecord.h b/include/IECoreGL/HitRecord.h index 41d1f54c9d..4d8a70aa71 100644 --- a/include/IECoreGL/HitRecord.h +++ b/include/IECoreGL/HitRecord.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_HITRECORD_H -#define IECOREGL_HITRECORD_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/GL.h" @@ -76,4 +75,3 @@ class IECOREGL_API HitRecord } // namespace IECoreGL -#endif // IECOREGL_HITRECORD_H diff --git a/include/IECoreGL/IECoreGL.h b/include/IECoreGL/IECoreGL.h index e13aa05b08..6cc5cf2de0 100644 --- a/include/IECoreGL/IECoreGL.h +++ b/include/IECoreGL/IECoreGL.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_COREGL_H -#define IECOREGL_COREGL_H +#pragma once #include "IECoreGL/Export.h" @@ -53,4 +52,3 @@ IECOREGL_API int glslVersion(); } // namespace IECoreGL -#endif // IECOREGL_COREGL_H diff --git a/include/IECoreGL/LuminanceTexture.h b/include/IECoreGL/LuminanceTexture.h index afc52d62b6..5c340cdfc1 100644 --- a/include/IECoreGL/LuminanceTexture.h +++ b/include/IECoreGL/LuminanceTexture.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_LUMINANCETEXTURE_H -#define IECOREGL_LUMINANCETEXTURE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Texture.h" @@ -77,4 +76,3 @@ IE_CORE_DECLAREPTR( LuminanceTexture ); } // namespace IECoreGL -#endif // IECOREGL_LUMINANCETEXTURE_H diff --git a/include/IECoreGL/MeshPrimitive.h b/include/IECoreGL/MeshPrimitive.h index cf72faf1b6..af9ff7a1ca 100644 --- a/include/IECoreGL/MeshPrimitive.h +++ b/include/IECoreGL/MeshPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_MESHPRIMITIVE_H -#define IECOREGL_MESHPRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Primitive.h" @@ -74,4 +73,3 @@ IE_CORE_DECLAREPTR( MeshPrimitive ); } // namespace IECoreGL -#endif // IECOREGL_MESHPRIMITIVE_H diff --git a/include/IECoreGL/NameStateComponent.h b/include/IECoreGL/NameStateComponent.h index f4b60bd16a..cec4d3cef0 100644 --- a/include/IECoreGL/NameStateComponent.h +++ b/include/IECoreGL/NameStateComponent.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_NAMESTATECOMPONENT_H -#define IECOREGL_NAMESTATECOMPONENT_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/StateComponent.h" @@ -114,4 +113,3 @@ IE_CORE_DECLAREPTR( NameStateComponent ); } // namespace IECoreGL -#endif // IECOREGL_NAMESTATECOMPONENT_H diff --git a/include/IECoreGL/NumericTraits.h b/include/IECoreGL/NumericTraits.h index 9e1ccd51e7..4eb979069b 100644 --- a/include/IECoreGL/NumericTraits.h +++ b/include/IECoreGL/NumericTraits.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_NUMERICTRAITS_H -#define IECOREGL_NUMERICTRAITS_H +#pragma once #include "IECoreGL/GL.h" @@ -88,4 +87,3 @@ IECOREGL_API GLenum glType( const IECore::Data *data ); } // namespace IECoreGL -#endif // IECOREGL_NUMERICTRAITS_H diff --git a/include/IECoreGL/PointsPrimitive.h b/include/IECoreGL/PointsPrimitive.h index 8d86046bf2..0b0f915f1d 100644 --- a/include/IECoreGL/PointsPrimitive.h +++ b/include/IECoreGL/PointsPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_POINTSPRIMITIVE_H -#define IECOREGL_POINTSPRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Primitive.h" @@ -107,4 +106,3 @@ IE_CORE_DECLAREPTR( PointsPrimitive ); } // namespace IECoreGL -#endif // IECOREGL_POINTSPRIMITIVE_H diff --git a/include/IECoreGL/Primitive.h b/include/IECoreGL/Primitive.h index 5d19ca00ce..dbb246f397 100644 --- a/include/IECoreGL/Primitive.h +++ b/include/IECoreGL/Primitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_PRIMITIVE_H -#define IECOREGL_PRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/GL.h" @@ -202,4 +201,3 @@ IE_CORE_DECLAREPTR( Primitive ); } // namespace IECoreGL -#endif // IECOREGL_PRIMITIVE_H diff --git a/include/IECoreGL/QuadPrimitive.h b/include/IECoreGL/QuadPrimitive.h index cb8ae7e24a..6dea12bf6b 100644 --- a/include/IECoreGL/QuadPrimitive.h +++ b/include/IECoreGL/QuadPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_QUADPRIMITIVE_H -#define IECOREGL_QUADPRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Primitive.h" @@ -71,4 +70,3 @@ IE_CORE_DECLAREPTR( QuadPrimitive ); } // namespace IECoreGL -#endif // IECOREGL_QUADPRIMITIVE_H diff --git a/include/IECoreGL/Renderable.h b/include/IECoreGL/Renderable.h index 6e40cd7780..d53153012d 100644 --- a/include/IECoreGL/Renderable.h +++ b/include/IECoreGL/Renderable.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_RENDERABLE_H -#define IECOREGL_RENDERABLE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/TypeIds.h" @@ -79,4 +78,3 @@ IE_CORE_DECLAREPTR( Renderable ); } // namespace IECoreGL -#endif // IECOREGL_RENDERABLE_H diff --git a/include/IECoreGL/Scene.h b/include/IECoreGL/Scene.h index e06f526c03..4e00b96e60 100644 --- a/include/IECoreGL/Scene.h +++ b/include/IECoreGL/Scene.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SCENE_H -#define IECOREGL_SCENE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/HitRecord.h" @@ -98,4 +97,3 @@ IE_CORE_DECLAREPTR( Scene ); } // namespace IECoreGL -#endif // IECOREGL_SCENE_H diff --git a/include/IECoreGL/Selector.h b/include/IECoreGL/Selector.h index 0f6a8da03b..440294124f 100644 --- a/include/IECoreGL/Selector.h +++ b/include/IECoreGL/Selector.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SELECTOR_H -#define IECOREGL_SELECTOR_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/HitRecord.h" @@ -157,4 +156,3 @@ class IECOREGL_API Selector : boost::noncopyable } // namespace IECoreGL -#endif // IECOREGL_SELECTOR_H diff --git a/include/IECoreGL/Shader.h b/include/IECoreGL/Shader.h index c650bb887f..30f911b317 100644 --- a/include/IECoreGL/Shader.h +++ b/include/IECoreGL/Shader.h @@ -35,8 +35,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SHADER_H -#define IECOREGL_SHADER_H +#pragma once #include "IECoreGL/Bindable.h" #include "IECoreGL/Export.h" @@ -250,4 +249,3 @@ class IECOREGL_API Shader : public IECore::RunTimeTyped } // namespace IECoreGL -#endif // IECOREGL_SHADER_H diff --git a/include/IECoreGL/ShaderLoader.h b/include/IECoreGL/ShaderLoader.h index 71e8ab6280..36a0ea1cf2 100644 --- a/include/IECoreGL/ShaderLoader.h +++ b/include/IECoreGL/ShaderLoader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SHADERLOADER_H -#define IECOREGL_SHADERLOADER_H +#pragma once #include "IECoreGL/Export.h" @@ -105,4 +104,3 @@ class IECOREGL_API ShaderLoader : public IECore::RefCounted } // namespace IECoreGL -#endif // IECOREGL_SHADERLOADER_H diff --git a/include/IECoreGL/ShaderStateComponent.h b/include/IECoreGL/ShaderStateComponent.h index 3014335f5c..bf33c12796 100644 --- a/include/IECoreGL/ShaderStateComponent.h +++ b/include/IECoreGL/ShaderStateComponent.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SHADERSTATECOMPONENT_H -#define IECOREGL_SHADERSTATECOMPONENT_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Shader.h" @@ -104,4 +103,3 @@ IE_CORE_DECLAREPTR( ShaderStateComponent ); } // namespace IECoreGL -#endif // IECOREGL_SHADERSTATECOMPONENT_H diff --git a/include/IECoreGL/SpherePrimitive.h b/include/IECoreGL/SpherePrimitive.h index d7e1258447..4343cc6d01 100644 --- a/include/IECoreGL/SpherePrimitive.h +++ b/include/IECoreGL/SpherePrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SPHEREPRIMITIVE_H -#define IECOREGL_SPHEREPRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Primitive.h" @@ -76,4 +75,3 @@ IE_CORE_DECLAREPTR( SpherePrimitive ); } // namespace IECoreGL -#endif // IECOREGL_SPHEREPRIMITIVE_H diff --git a/include/IECoreGL/SplineToGLTextureConverter.h b/include/IECoreGL/SplineToGLTextureConverter.h index 7855fcfee1..ac05c1d7c6 100644 --- a/include/IECoreGL/SplineToGLTextureConverter.h +++ b/include/IECoreGL/SplineToGLTextureConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SPLINETOGLTEXTURECONVERTER_H -#define IECOREGL_SPLINETOGLTEXTURECONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/ToGLConverter.h" @@ -78,4 +77,3 @@ IE_CORE_DECLAREPTR( SplineToGLTextureConverter ); } // namespace IECoreGL -#endif // IECOREGL_SPLINETOGLTEXTURECONVERTER_H diff --git a/include/IECoreGL/State.h b/include/IECoreGL/State.h index 07e847e736..8a17594c0b 100644 --- a/include/IECoreGL/State.h +++ b/include/IECoreGL/State.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_STATE_H -#define IECOREGL_STATE_H +#pragma once #include "IECoreGL/Bindable.h" #include "IECoreGL/Export.h" @@ -150,4 +149,3 @@ class IECOREGL_API State : public Bindable #include "IECoreGL/State.inl" -#endif // IECOREGL_STATE_H diff --git a/include/IECoreGL/State.inl b/include/IECoreGL/State.inl index bd8cf5646e..28477d1084 100644 --- a/include/IECoreGL/State.inl +++ b/include/IECoreGL/State.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_STATE_INL -#define IECOREGL_STATE_INL +#pragma once namespace IECoreGL { @@ -57,5 +56,3 @@ void State::remove() } } // namespace IECoreGL - -#endif // IECOREGL_STATE_INL diff --git a/include/IECoreGL/StateComponent.h b/include/IECoreGL/StateComponent.h index 5b20076d82..d568d84c8f 100644 --- a/include/IECoreGL/StateComponent.h +++ b/include/IECoreGL/StateComponent.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_STATECOMPONENT_H -#define IECOREGL_STATECOMPONENT_H +#pragma once #include "IECoreGL/Bindable.h" #include "IECoreGL/Export.h" @@ -78,4 +77,3 @@ IE_CORE_DECLAREPTR( StateComponent ); #include "IECoreGL/StateComponent.inl" -#endif // IECOREGL_STATECOMPONENT_H diff --git a/include/IECoreGL/StateComponent.inl b/include/IECoreGL/StateComponent.inl index 0375fa1351..924195ca7a 100644 --- a/include/IECoreGL/StateComponent.inl +++ b/include/IECoreGL/StateComponent.inl @@ -1,5 +1,4 @@ -#ifndef IECOREGL_STATECOMPONENT_INL -#define IECOREGL_STATECOMPONENT_INL +#pragma once #include "IECoreGL/State.h" @@ -19,5 +18,3 @@ StateComponentPtr StateComponent::Description::creator() } } // namespace IECoreGL - -#endif // IECOREGL_STATECOMPONENT_INL diff --git a/include/IECoreGL/TextPrimitive.h b/include/IECoreGL/TextPrimitive.h index efcb7b4f0a..6bf1c7f34b 100644 --- a/include/IECoreGL/TextPrimitive.h +++ b/include/IECoreGL/TextPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TEXTPRIMITIVE_H -#define IECOREGL_TEXTPRIMITIVE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Primitive.h" @@ -91,4 +90,3 @@ IE_CORE_DECLAREPTR( TextPrimitive ); } // namespace IECoreGL -#endif // IECOREGL_TEXTPRIMITIVE_H diff --git a/include/IECoreGL/Texture.h b/include/IECoreGL/Texture.h index 8257b4e649..43bdab73dd 100644 --- a/include/IECoreGL/Texture.h +++ b/include/IECoreGL/Texture.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TEXTURE_H -#define IECOREGL_TEXTURE_H +#pragma once #include "IECoreGL/Bindable.h" #include "IECoreGL/Export.h" @@ -106,4 +105,3 @@ IE_CORE_DECLAREPTR( Texture ); } // namespace IECoreGL -#endif // IECOREGL_TEXTURE_H diff --git a/include/IECoreGL/TextureLoader.h b/include/IECoreGL/TextureLoader.h index 8d1afe0fcb..e48d896d93 100644 --- a/include/IECoreGL/TextureLoader.h +++ b/include/IECoreGL/TextureLoader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TEXTURELOADER_H -#define IECOREGL_TEXTURELOADER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Texture.h" @@ -86,4 +85,3 @@ class IECOREGL_API TextureLoader : public IECore::RefCounted } // namespace IECoreGL -#endif // IECOREGL_TEXTURELOADER_H diff --git a/include/IECoreGL/ToGLBufferConverter.h b/include/IECoreGL/ToGLBufferConverter.h index b92cad217a..b696198dd7 100644 --- a/include/IECoreGL/ToGLBufferConverter.h +++ b/include/IECoreGL/ToGLBufferConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLBUFFERCONVERTER_H -#define IECOREGL_TOGLBUFFERCONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/ToGLConverter.h" @@ -79,4 +78,3 @@ IE_CORE_DECLAREPTR( ToGLBufferConverter ); } // namespace IECoreGL -#endif // IECOREGL_TOGLBUFFERCONVERTER_H diff --git a/include/IECoreGL/ToGLCameraConverter.h b/include/IECoreGL/ToGLCameraConverter.h index 7c0ae6401a..f243189e70 100644 --- a/include/IECoreGL/ToGLCameraConverter.h +++ b/include/IECoreGL/ToGLCameraConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLCAMERACONVERTER_H -#define IECOREGL_TOGLCAMERACONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/ToGLConverter.h" @@ -74,4 +73,3 @@ IE_CORE_DECLAREPTR( ToGLCameraConverter ); } // namespace IECoreGL -#endif // IECOREGL_TOGLCAMERACONVERTER_H diff --git a/include/IECoreGL/ToGLConverter.h b/include/IECoreGL/ToGLConverter.h index fed56e8033..21edffe6fc 100644 --- a/include/IECoreGL/ToGLConverter.h +++ b/include/IECoreGL/ToGLConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLCONVERTER_H -#define IECOREGL_TOGLCONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/TypeIds.h" @@ -119,4 +118,3 @@ class IECOREGL_API ToGLConverter : public IECore::FromCoreConverter #include "IECoreGL/ToGLConverter.inl" -#endif // IECOREGL_TOGLCONVERTER_H diff --git a/include/IECoreGL/ToGLConverter.inl b/include/IECoreGL/ToGLConverter.inl index 7e1ca74121..4058db4a1d 100644 --- a/include/IECoreGL/ToGLConverter.inl +++ b/include/IECoreGL/ToGLConverter.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLCONVERTER_INL -#define IECOREGL_TOGLCONVERTER_INL +#pragma once namespace IECoreGL { @@ -63,5 +62,3 @@ ToGLConverterPtr ToGLConverter::ConverterDescription::creator( IECore::ConstO } } // namespace IECoreGL - -#endif // IECOREGL_TOGLCONVERTER_INL diff --git a/include/IECoreGL/ToGLCurvesConverter.h b/include/IECoreGL/ToGLCurvesConverter.h index 626b0320b8..a6cc3e3dac 100644 --- a/include/IECoreGL/ToGLCurvesConverter.h +++ b/include/IECoreGL/ToGLCurvesConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLCURVESCONVERTER_H -#define IECOREGL_TOGLCURVESCONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/ToGLConverter.h" @@ -77,4 +76,3 @@ class IECOREGL_API ToGLCurvesConverter : public ToGLConverter } // namespace IECoreGL -#endif // IECOREGL_TOGLCURVESCONVERTER_H diff --git a/include/IECoreGL/ToGLMeshConverter.h b/include/IECoreGL/ToGLMeshConverter.h index dac1470d8e..19eadd3166 100644 --- a/include/IECoreGL/ToGLMeshConverter.h +++ b/include/IECoreGL/ToGLMeshConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLMESHCONVERTER_H -#define IECOREGL_TOGLMESHCONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/ToGLConverter.h" @@ -77,4 +76,3 @@ IE_CORE_DECLAREPTR( ToGLMeshConverter ); } // namespace IECoreGL -#endif // IECOREGL_TOGLMESHCONVERTER_H diff --git a/include/IECoreGL/ToGLPointsConverter.h b/include/IECoreGL/ToGLPointsConverter.h index ee657a2021..ba62b5e16a 100644 --- a/include/IECoreGL/ToGLPointsConverter.h +++ b/include/IECoreGL/ToGLPointsConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLPOINTSCONVERTER_H -#define IECOREGL_TOGLPOINTSCONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/ToGLConverter.h" @@ -75,4 +74,3 @@ class IECOREGL_API ToGLPointsConverter : public ToGLConverter } // namespace IECoreGL -#endif // IECOREGL_TOGLPOINTSCONVERTER_H diff --git a/include/IECoreGL/ToGLSphereConverter.h b/include/IECoreGL/ToGLSphereConverter.h index 62131bdab7..3bcebd4d75 100644 --- a/include/IECoreGL/ToGLSphereConverter.h +++ b/include/IECoreGL/ToGLSphereConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLSPHERECONVERTER_H -#define IECOREGL_TOGLSPHERECONVERTER_H +#pragma once #include "IECoreGL/ToGLConverter.h" @@ -76,4 +75,3 @@ IE_CORE_DECLAREPTR( ToGLSphereConverter ); } // namespace IECoreGL -#endif // IECOREGL_TOGLSPHERECONVERTER_H diff --git a/include/IECoreGL/ToGLStateConverter.h b/include/IECoreGL/ToGLStateConverter.h index ef923e4137..85d877320c 100644 --- a/include/IECoreGL/ToGLStateConverter.h +++ b/include/IECoreGL/ToGLStateConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLSTATECONVERTER_H -#define IECOREGL_TOGLSTATECONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/ToGLConverter.h" @@ -82,4 +81,3 @@ IE_CORE_DECLAREPTR( ToGLStateConverter ); } // namespace IECoreGL -#endif // IECOREGL_TOGLSTATECONVERTER_H diff --git a/include/IECoreGL/ToGLTextureConverter.h b/include/IECoreGL/ToGLTextureConverter.h index 3bed058f7a..6135332bf5 100644 --- a/include/IECoreGL/ToGLTextureConverter.h +++ b/include/IECoreGL/ToGLTextureConverter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLTEXTURECONVERTER_H -#define IECOREGL_TOGLTEXTURECONVERTER_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/ToGLConverter.h" @@ -109,4 +108,3 @@ IE_CORE_DECLAREPTR( ToGLTextureConverter ); } // namespace IECoreGL -#endif // IECOREGL_TOGLTEXTURECONVERTER_H diff --git a/include/IECoreGL/TypeIds.h b/include/IECoreGL/TypeIds.h index aadcadc37c..a0e448b967 100644 --- a/include/IECoreGL/TypeIds.h +++ b/include/IECoreGL/TypeIds.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TYPEIDS_H -#define IE_COREGL_TYPEIDS_H +#pragma once namespace IECoreGL { @@ -128,4 +127,3 @@ enum TypeId } // namespace IECoreGL -#endif // IE_COREGL_TYPEIDS_H diff --git a/include/IECoreGL/TypedStateComponent.h b/include/IECoreGL/TypedStateComponent.h index 87a44e1098..36afcf6a84 100644 --- a/include/IECoreGL/TypedStateComponent.h +++ b/include/IECoreGL/TypedStateComponent.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TYPEDSTATECOMPONENT_H -#define IECOREGL_TYPEDSTATECOMPONENT_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/StateComponent.h" @@ -263,4 +262,3 @@ IE_CORE_DECLAREPTR( AutomaticInstancingStateComponent ); #include "IECoreGL/TypedStateComponent.inl" -#endif // IECOREGL_TYPEDSTATECOMPONENT_H diff --git a/include/IECoreGL/TypedStateComponent.inl b/include/IECoreGL/TypedStateComponent.inl index 03f74ca5aa..cce333f9b9 100644 --- a/include/IECoreGL/TypedStateComponent.inl +++ b/include/IECoreGL/TypedStateComponent.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TYPEDSTATECOMPONENT_INL -#define IECOREGL_TYPEDSTATECOMPONENT_INL +#pragma once namespace IECoreGL { @@ -122,5 +121,3 @@ void TypedStateComponent::bind() const } } // namespace IECoreGL - -#endif // IECOREGL_TYPEDSTATECOMPONENT_INL diff --git a/include/IECoreGL/UIntTexture.h b/include/IECoreGL/UIntTexture.h index a92e4aec83..bae7c68d88 100644 --- a/include/IECoreGL/UIntTexture.h +++ b/include/IECoreGL/UIntTexture.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_UINTTEXTURE_H -#define IECOREGL_UINTTEXTURE_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/Texture.h" @@ -60,4 +59,3 @@ IE_CORE_DECLAREPTR( UIntTexture ); } // namespace IECoreGL -#endif // IECOREGL_UINTTEXTURE_H diff --git a/include/IECoreGL/UniformFunctions.h b/include/IECoreGL/UniformFunctions.h index 14a2b07810..3612950ce9 100644 --- a/include/IECoreGL/UniformFunctions.h +++ b/include/IECoreGL/UniformFunctions.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_UNIFORMFUNCTIONS_H -#define IECOREGL_UNIFORMFUNCTIONS_H +#pragma once #include "IECoreGL/Export.h" #include "IECoreGL/GL.h" @@ -67,4 +66,3 @@ IECOREGL_API const std::vector > &uniformMatr } // namespace IECoreGL -#endif // IECOREGL_UNIFORMFUNCTIONS_H diff --git a/include/IECoreGL/bindings/AlphaTextureBinding.h b/include/IECoreGL/bindings/AlphaTextureBinding.h index 0d35a72879..a83b94df4f 100644 --- a/include/IECoreGL/bindings/AlphaTextureBinding.h +++ b/include/IECoreGL/bindings/AlphaTextureBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_ALPHATEXTUREBINDING_H -#define IE_COREGL_ALPHATEXTUREBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindAlphaTexture(); } -#endif // IE_COREGL_ALPHATEXTUREBINDING_H diff --git a/include/IECoreGL/bindings/BindableBinding.h b/include/IECoreGL/bindings/BindableBinding.h index 1df9f69c9d..65ee2dbc99 100644 --- a/include/IECoreGL/bindings/BindableBinding.h +++ b/include/IECoreGL/bindings/BindableBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_BINDABLEBINDING_H -#define IE_COREGL_BINDABLEBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindBindable(); } -#endif // IE_COREGL_BINDABLEBINDING_H diff --git a/include/IECoreGL/bindings/BufferBinding.h b/include/IECoreGL/bindings/BufferBinding.h index 390d5b0039..a05e48d63a 100644 --- a/include/IECoreGL/bindings/BufferBinding.h +++ b/include/IECoreGL/bindings/BufferBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_BUFFERBINDING_H -#define IE_COREGL_BUFFERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindBuffer(); } // namespace IECoreGL -#endif // IE_COREGL_BUFFERBINDING_H diff --git a/include/IECoreGL/bindings/CachedConverterBinding.h b/include/IECoreGL/bindings/CachedConverterBinding.h index 251376b462..fc18e39d38 100644 --- a/include/IECoreGL/bindings/CachedConverterBinding.h +++ b/include/IECoreGL/bindings/CachedConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_CACHEDCONVERTERBINDING_H -#define IECOREGL_CACHEDCONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindCachedConverter(); } -#endif // IECOREGL_CACHEDCONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/CameraBinding.h b/include/IECoreGL/bindings/CameraBinding.h index 2478b14449..1eeac7ca2d 100644 --- a/include/IECoreGL/bindings/CameraBinding.h +++ b/include/IECoreGL/bindings/CameraBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_CAMERABINDING_H -#define IE_COREGL_CAMERABINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindCamera(); } -#endif // IE_COREGL_CAMERABINDING_H diff --git a/include/IECoreGL/bindings/ColorTextureBinding.h b/include/IECoreGL/bindings/ColorTextureBinding.h index 384b9f7121..154e2a64a2 100644 --- a/include/IECoreGL/bindings/ColorTextureBinding.h +++ b/include/IECoreGL/bindings/ColorTextureBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_COLORTEXTUREBINDING_H -#define IE_COREGL_COLORTEXTUREBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindColorTexture(); } -#endif // IE_COREGL_COLORTEXTUREBINDING_H diff --git a/include/IECoreGL/bindings/CurvesPrimitiveBinding.h b/include/IECoreGL/bindings/CurvesPrimitiveBinding.h index 13b6b7fc63..6d4c9f341d 100644 --- a/include/IECoreGL/bindings/CurvesPrimitiveBinding.h +++ b/include/IECoreGL/bindings/CurvesPrimitiveBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_CURVESPRIMITIVEBINDING_H -#define IECOREGL_CURVESPRIMITIVEBINDING_H +#pragma once #include "IECoreGL/Export.h" @@ -44,4 +43,3 @@ void bindCurvesPrimitive(); } // namespace IECoreGL -#endif // IECOREGL_CURVESPRIMITIVEBINDING_H diff --git a/include/IECoreGL/bindings/DepthTextureBinding.h b/include/IECoreGL/bindings/DepthTextureBinding.h index f3edd96842..df0bb27d94 100644 --- a/include/IECoreGL/bindings/DepthTextureBinding.h +++ b/include/IECoreGL/bindings/DepthTextureBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_DEPTHTEXTUREBINDING_H -#define IE_COREGL_DEPTHTEXTUREBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindDepthTexture(); } -#endif // IE_COREGL_DEPTHTEXTUREBINDING_H diff --git a/include/IECoreGL/bindings/FontBinding.h b/include/IECoreGL/bindings/FontBinding.h index 547d5e7347..2c57bb84fa 100644 --- a/include/IECoreGL/bindings/FontBinding.h +++ b/include/IECoreGL/bindings/FontBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_FONTBINDING_H -#define IECOREGL_FONTBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindFont(); } -#endif // IECOREGL_FONTBINDING_H diff --git a/include/IECoreGL/bindings/FontLoaderBinding.h b/include/IECoreGL/bindings/FontLoaderBinding.h index 70fe43b89b..c1cc442e07 100644 --- a/include/IECoreGL/bindings/FontLoaderBinding.h +++ b/include/IECoreGL/bindings/FontLoaderBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_FONTLOADERBINDING_H -#define IECOREGL_FONTLOADERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindFontLoader(); } -#endif // IECOREGL_FONTLOADERBINDING_H diff --git a/include/IECoreGL/bindings/FrameBufferBinding.h b/include/IECoreGL/bindings/FrameBufferBinding.h index 53391a6ec1..4615ca2acf 100644 --- a/include/IECoreGL/bindings/FrameBufferBinding.h +++ b/include/IECoreGL/bindings/FrameBufferBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_FRAMEBUFFERBINDING_H -#define IE_COREGL_FRAMEBUFFERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindFrameBuffer(); } -#endif // IE_COREGL_FRAMEBUFFERBINDING_H diff --git a/include/IECoreGL/bindings/GroupBinding.h b/include/IECoreGL/bindings/GroupBinding.h index e32e681a65..7580e8d83e 100644 --- a/include/IECoreGL/bindings/GroupBinding.h +++ b/include/IECoreGL/bindings/GroupBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_GROUPBINDING_H -#define IE_COREGL_GROUPBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindGroup(); } -#endif // IE_COREGL_GROUPBINDING_H diff --git a/include/IECoreGL/bindings/HitRecordBinding.h b/include/IECoreGL/bindings/HitRecordBinding.h index c52b66dc8a..fa760973e5 100644 --- a/include/IECoreGL/bindings/HitRecordBinding.h +++ b/include/IECoreGL/bindings/HitRecordBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_HITRECORDBINDING_H -#define IECOREGL_HITRECORDBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindHitRecord(); } -#endif // IECOREGL_HITRECORDBINDING_H diff --git a/include/IECoreGL/bindings/LuminanceTextureBinding.h b/include/IECoreGL/bindings/LuminanceTextureBinding.h index e29a390ff6..1ced193f45 100644 --- a/include/IECoreGL/bindings/LuminanceTextureBinding.h +++ b/include/IECoreGL/bindings/LuminanceTextureBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_LUMINANCETEXTUREBINDING_H -#define IE_COREGL_LUMINANCETEXTUREBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindLuminanceTexture(); } -#endif // IE_COREGL_LUMINANCETEXTUREBINDING_H diff --git a/include/IECoreGL/bindings/MeshPrimitiveBinding.h b/include/IECoreGL/bindings/MeshPrimitiveBinding.h index d6b488c2f2..5d0b9ac200 100644 --- a/include/IECoreGL/bindings/MeshPrimitiveBinding.h +++ b/include/IECoreGL/bindings/MeshPrimitiveBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_MESHPRIMITIVEBINDING_H -#define IECOREGL_MESHPRIMITIVEBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindMeshPrimitive(); } -#endif // IECOREGL_MESHPRIMITIVEBINDING_H diff --git a/include/IECoreGL/bindings/NameStateComponentBinding.h b/include/IECoreGL/bindings/NameStateComponentBinding.h index f468871d75..c04665a2bf 100644 --- a/include/IECoreGL/bindings/NameStateComponentBinding.h +++ b/include/IECoreGL/bindings/NameStateComponentBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_NAMESTATECOMPONENTBINDING_H -#define IECOREGL_NAMESTATECOMPONENTBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindNameStateComponent(); } -#endif // IECOREGL_NAMESTATECOMPONENTBINDING_H diff --git a/include/IECoreGL/bindings/PerspectiveCameraBinding.h b/include/IECoreGL/bindings/PerspectiveCameraBinding.h index 8e7d4395bc..2b6477dd89 100644 --- a/include/IECoreGL/bindings/PerspectiveCameraBinding.h +++ b/include/IECoreGL/bindings/PerspectiveCameraBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_PERSPECTIVECAMERABINDING_H -#define IE_COREGL_PERSPECTIVECAMERABINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindPerspectiveCamera(); } -#endif // IE_COREGL_PERSPECTIVECAMERABINDING_H diff --git a/include/IECoreGL/bindings/PointsPrimitiveBinding.h b/include/IECoreGL/bindings/PointsPrimitiveBinding.h index 39d5c51fd9..26289dae8c 100644 --- a/include/IECoreGL/bindings/PointsPrimitiveBinding.h +++ b/include/IECoreGL/bindings/PointsPrimitiveBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_POINTSPRIMITIVEBINDING_H -#define IE_COREGL_POINTSPRIMITIVEBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindPointsPrimitive(); } -#endif // IE_COREGL_POINTSPRIMITIVEBINDING_H diff --git a/include/IECoreGL/bindings/PrimitiveBinding.h b/include/IECoreGL/bindings/PrimitiveBinding.h index 32ff073527..24be32ed1e 100644 --- a/include/IECoreGL/bindings/PrimitiveBinding.h +++ b/include/IECoreGL/bindings/PrimitiveBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_PRIMITIVEBINDING_H -#define IE_COREGL_PRIMITIVEBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindPrimitive(); } -#endif // IE_COREGL_PRIMITIVEBINDING_H diff --git a/include/IECoreGL/bindings/RenderableBinding.h b/include/IECoreGL/bindings/RenderableBinding.h index 2efa949029..e079b9377e 100644 --- a/include/IECoreGL/bindings/RenderableBinding.h +++ b/include/IECoreGL/bindings/RenderableBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_RENDERABLEBINDING_H -#define IE_COREGL_RENDERABLEBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindRenderable(); } -#endif // IE_COREGL_RENDERABLEBINDING_H diff --git a/include/IECoreGL/bindings/SceneBinding.h b/include/IECoreGL/bindings/SceneBinding.h index c02e08e47b..f76d6864f5 100644 --- a/include/IECoreGL/bindings/SceneBinding.h +++ b/include/IECoreGL/bindings/SceneBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_SCENEBINDING_H -#define IE_COREGL_SCENEBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindScene(); } -#endif // IE_COREGL_SCENEBINDING_H diff --git a/include/IECoreGL/bindings/SelectorBinding.h b/include/IECoreGL/bindings/SelectorBinding.h index 40d913773f..9a14ec1af1 100644 --- a/include/IECoreGL/bindings/SelectorBinding.h +++ b/include/IECoreGL/bindings/SelectorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SELECTORBINDING_H -#define IECOREGL_SELECTORBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindSelector(); } -#endif // IECOREGL_SELECTORBINDING_H diff --git a/include/IECoreGL/bindings/ShaderBinding.h b/include/IECoreGL/bindings/ShaderBinding.h index fbeed2b0c1..e6c6eb6eb9 100644 --- a/include/IECoreGL/bindings/ShaderBinding.h +++ b/include/IECoreGL/bindings/ShaderBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_SHADERBINDING_H -#define IE_COREGL_SHADERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindShader(); } -#endif // IE_COREGL_SHADERBINDING_H diff --git a/include/IECoreGL/bindings/ShaderLoaderBinding.h b/include/IECoreGL/bindings/ShaderLoaderBinding.h index 8027b09027..e900b69e10 100644 --- a/include/IECoreGL/bindings/ShaderLoaderBinding.h +++ b/include/IECoreGL/bindings/ShaderLoaderBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SHADERLOADERBINDING_H -#define IECOREGL_SHADERLOADERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindShaderLoader(); } -#endif // IECOREGL_SHADERLOADERBINDING_H diff --git a/include/IECoreGL/bindings/ShaderStateComponentBinding.h b/include/IECoreGL/bindings/ShaderStateComponentBinding.h index bb3f1e2671..385ba8630d 100644 --- a/include/IECoreGL/bindings/ShaderStateComponentBinding.h +++ b/include/IECoreGL/bindings/ShaderStateComponentBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SHADERSTATECOMPONENTBINDING_H -#define IECOREGL_SHADERSTATECOMPONENTBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindShaderStateComponent(); } // namespace IECoreGL -#endif // IECOREGL_SHADERSTATECOMPONENTBINDING_H diff --git a/include/IECoreGL/bindings/SplineToGLTextureConverterBinding.h b/include/IECoreGL/bindings/SplineToGLTextureConverterBinding.h index 18aae960ef..43abb4fc5e 100644 --- a/include/IECoreGL/bindings/SplineToGLTextureConverterBinding.h +++ b/include/IECoreGL/bindings/SplineToGLTextureConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_SPLINETOGLTEXTURECONVERTERBINDING_H -#define IECOREGL_SPLINETOGLTEXTURECONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindSplineToGLTextureConverter(); } -#endif // IECOREGL_SPLINETOGLTEXTURECONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/StateBinding.h b/include/IECoreGL/bindings/StateBinding.h index a3b553f3c6..b6f2eb0b51 100644 --- a/include/IECoreGL/bindings/StateBinding.h +++ b/include/IECoreGL/bindings/StateBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_STATEBINDING_H -#define IE_COREGL_STATEBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindState(); } -#endif // IE_COREGL_STATEBINDING_H diff --git a/include/IECoreGL/bindings/StateComponentBinding.h b/include/IECoreGL/bindings/StateComponentBinding.h index bea1bb7bca..811ca3a746 100644 --- a/include/IECoreGL/bindings/StateComponentBinding.h +++ b/include/IECoreGL/bindings/StateComponentBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_STATECOMPONENTBINDING_H -#define IE_COREGL_STATECOMPONENTBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindStateComponent(); } -#endif // IE_COREGL_STATECOMPONENTBINDING_H diff --git a/include/IECoreGL/bindings/TextureBinding.h b/include/IECoreGL/bindings/TextureBinding.h index cefc6632a5..d5824d1777 100644 --- a/include/IECoreGL/bindings/TextureBinding.h +++ b/include/IECoreGL/bindings/TextureBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TEXTUREBINDING_H -#define IE_COREGL_TEXTUREBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindTexture(); } -#endif // IE_COREGL_TEXTUREBINDING_H diff --git a/include/IECoreGL/bindings/TextureLoaderBinding.h b/include/IECoreGL/bindings/TextureLoaderBinding.h index 4ec49c9aed..ae3d14f93d 100644 --- a/include/IECoreGL/bindings/TextureLoaderBinding.h +++ b/include/IECoreGL/bindings/TextureLoaderBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TEXTURELOADERBINDING_H -#define IE_COREGL_TEXTURELOADERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindTextureLoader(); } -#endif // IE_COREGL_TEXTURELOADERBINDING_H diff --git a/include/IECoreGL/bindings/ToGLCameraConverterBinding.h b/include/IECoreGL/bindings/ToGLCameraConverterBinding.h index edd6ca7d25..00e5e89a98 100644 --- a/include/IECoreGL/bindings/ToGLCameraConverterBinding.h +++ b/include/IECoreGL/bindings/ToGLCameraConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TOGLCAMERACONVERTERBINDING_H -#define IE_COREGL_TOGLCAMERACONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindToGLCameraConverter(); } -#endif // IE_COREGL_TOGLCAMERACONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/ToGLConverterBinding.h b/include/IECoreGL/bindings/ToGLConverterBinding.h index 2563caf7c5..888e400e5c 100644 --- a/include/IECoreGL/bindings/ToGLConverterBinding.h +++ b/include/IECoreGL/bindings/ToGLConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TOGLCONVERTERBINDING_H -#define IE_COREGL_TOGLCONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindToGLConverter(); } -#endif // IE_COREGL_TOGLCONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/ToGLCurvesConverterBinding.h b/include/IECoreGL/bindings/ToGLCurvesConverterBinding.h index 3cdd8200f2..9119a8661b 100644 --- a/include/IECoreGL/bindings/ToGLCurvesConverterBinding.h +++ b/include/IECoreGL/bindings/ToGLCurvesConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLCURVESCONVERTERBINDING_H -#define IECOREGL_TOGLCURVESCONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindToGLCurvesConverter(); } -#endif // IECOREGL_TOGLCURVESCONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/ToGLMeshConverterBinding.h b/include/IECoreGL/bindings/ToGLMeshConverterBinding.h index 517c72a33b..4b6ad786c8 100644 --- a/include/IECoreGL/bindings/ToGLMeshConverterBinding.h +++ b/include/IECoreGL/bindings/ToGLMeshConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TOGLMESHCONVERTERBINDING_H -#define IE_COREGL_TOGLMESHCONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindToGLMeshConverter(); } -#endif // IE_COREGL_TOGLMESHCONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/ToGLPointsConverterBinding.h b/include/IECoreGL/bindings/ToGLPointsConverterBinding.h index 03f00eaadc..60a64ae731 100644 --- a/include/IECoreGL/bindings/ToGLPointsConverterBinding.h +++ b/include/IECoreGL/bindings/ToGLPointsConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLPOINTSCONVERTERBINDING_H -#define IECOREGL_TOGLPOINTSCONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindToGLPointsConverter(); } -#endif // IECOREGL_TOGLPOINTSCONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/ToGLStateConverterBinding.h b/include/IECoreGL/bindings/ToGLStateConverterBinding.h index e737d541b7..02b9978bb7 100644 --- a/include/IECoreGL/bindings/ToGLStateConverterBinding.h +++ b/include/IECoreGL/bindings/ToGLStateConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_TOGLSTATECONVERTERBINDING_H -#define IECOREGL_TOGLSTATECONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindToGLStateConverter(); } // namespace IECoreGL -#endif // IECOREGL_TOGLSTATECONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/ToGLTextureConverterBinding.h b/include/IECoreGL/bindings/ToGLTextureConverterBinding.h index 239239bffe..8550386d18 100644 --- a/include/IECoreGL/bindings/ToGLTextureConverterBinding.h +++ b/include/IECoreGL/bindings/ToGLTextureConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TOGLTEXTURECONVERTERBINDING_H -#define IE_COREGL_TOGLTEXTURECONVERTERBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindToGLTextureConverter(); } -#endif // IE_COREGL_TOGLTEXTURECONVERTERBINDING_H diff --git a/include/IECoreGL/bindings/TypedStateComponentBinding.h b/include/IECoreGL/bindings/TypedStateComponentBinding.h index e959da0b76..d97103605d 100644 --- a/include/IECoreGL/bindings/TypedStateComponentBinding.h +++ b/include/IECoreGL/bindings/TypedStateComponentBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TYPEDSTATECOMPONENTBINDING_H -#define IE_COREGL_TYPEDSTATECOMPONENTBINDING_H +#pragma once namespace IECoreGL { @@ -42,4 +41,3 @@ void bindTypedStateComponents(); } -#endif // IE_COREGL_TYPEDSTATECOMPONENTBINDING_H diff --git a/include/IECoreGL/bindings/TypedStateComponentBinding.inl b/include/IECoreGL/bindings/TypedStateComponentBinding.inl index bec90bfa2f..82934e1d77 100644 --- a/include/IECoreGL/bindings/TypedStateComponentBinding.inl +++ b/include/IECoreGL/bindings/TypedStateComponentBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_COREGL_TYPEDSTATECOMPONENTBINDING_INL -#define IE_COREGL_TYPEDSTATECOMPONENTBINDING_INL +#pragma once #include "IECorePython/RunTimeTypedBinding.h" @@ -50,5 +49,3 @@ void bindTypedStateComponent( const char *className ) } } - -#endif // IE_COREGL_TYPEDSTATECOMPONENTBINDING_INL diff --git a/include/IECoreGL/private/DeferredRendererImplementation.h b/include/IECoreGL/private/DeferredRendererImplementation.h index 578422f792..b13f8fd40e 100644 --- a/include/IECoreGL/private/DeferredRendererImplementation.h +++ b/include/IECoreGL/private/DeferredRendererImplementation.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_DEFERREDRENDERERIMPLEMENTATION_H -#define IECOREGL_DEFERREDRENDERERIMPLEMENTATION_H +#pragma once #include "IECoreGL/private/RendererImplementation.h" @@ -133,4 +132,3 @@ IE_CORE_DECLAREPTR( DeferredRendererImplementation ); } // namespace IECoreGL -#endif // IECOREGL_DEFERREDRENDERERIMPLEMENTATION_H diff --git a/include/IECoreGL/private/Display.h b/include/IECoreGL/private/Display.h index 6742233cae..ecc268d077 100644 --- a/include/IECoreGL/private/Display.h +++ b/include/IECoreGL/private/Display.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_DISPLAY_H -#define IECOREGL_DISPLAY_H +#pragma once #include "IECore/CompoundData.h" @@ -63,4 +62,3 @@ class Display : public IECore::RefCounted } // namespace IECoreGL -#endif // IECOREGL_DISPLAY_H diff --git a/include/IECoreGL/private/ImmediateRendererImplementation.h b/include/IECoreGL/private/ImmediateRendererImplementation.h index 1396a55fbd..bf1193eb63 100644 --- a/include/IECoreGL/private/ImmediateRendererImplementation.h +++ b/include/IECoreGL/private/ImmediateRendererImplementation.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREGL_IMMEDIATERENDERERIMPLEMENTATION_H -#define IECOREGL_IMMEDIATERENDERERIMPLEMENTATION_H +#pragma once #include "IECoreGL/FrameBuffer.h" #include "IECoreGL/private/RendererImplementation.h" @@ -102,4 +101,3 @@ IE_CORE_DECLAREPTR( ImmediateRendererImplementation ); } // namespace IECoreGL -#endif // IECOREGL_IMMEDIATERENDERERIMPLEMENTATION_H diff --git a/include/IECoreImage/ChannelOp.h b/include/IECoreImage/ChannelOp.h index 071cc96434..795fe53418 100644 --- a/include/IECoreImage/ChannelOp.h +++ b/include/IECoreImage/ChannelOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_CHANNELOP_H -#define IECOREIMAGE_CHANNELOP_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -90,5 +89,4 @@ IE_CORE_DECLAREPTR( ChannelOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_CHANNELOP_H diff --git a/include/IECoreImage/ClampOp.h b/include/IECoreImage/ClampOp.h index 2aca6bc6f8..b59ac6aa51 100644 --- a/include/IECoreImage/ClampOp.h +++ b/include/IECoreImage/ClampOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_CLAMPOP_H -#define IECOREIMAGE_CLAMPOP_H +#pragma once #include "IECoreImage/ChannelOp.h" #include "IECoreImage/Export.h" @@ -83,5 +82,4 @@ IE_CORE_DECLAREPTR( ClampOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_CLAMPOP_H diff --git a/include/IECoreImage/ClientDisplayDriver.h b/include/IECoreImage/ClientDisplayDriver.h index 1d1e7ed19c..62c6baa766 100644 --- a/include/IECoreImage/ClientDisplayDriver.h +++ b/include/IECoreImage/ClientDisplayDriver.h @@ -35,8 +35,7 @@ //! \file ClientDisplayDriver.h /// Defines the ClientDisplayDriver class. -#ifndef IECOREIMAGE_CLIENTDISPLAYDRIVER -#define IECOREIMAGE_CLIENTDISPLAYDRIVER +#pragma once #include "IECoreImage/DisplayDriver.h" #include "IECoreImage/Export.h" @@ -92,5 +91,3 @@ class IECOREIMAGE_API ClientDisplayDriver : public DisplayDriver IE_CORE_DECLAREPTR( ClientDisplayDriver ) } // namespace IECoreImage - -#endif // IECOREIMAGE_CLIENTDISPLAYDRIVER diff --git a/include/IECoreImage/ColorAlgo.h b/include/IECoreImage/ColorAlgo.h index 981e206d86..481876c8a7 100644 --- a/include/IECoreImage/ColorAlgo.h +++ b/include/IECoreImage/ColorAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_COLORALGO_H -#define IECOREIMAGE_COLORALGO_H +#pragma once #include "IECoreImage/Export.h" @@ -61,4 +60,3 @@ IECOREIMAGE_API void transformImage( ImagePrimitive *image, const std::string &i } // namespace IECoreImage -#endif // IECOREIMAGE_COLORALGO_H diff --git a/include/IECoreImage/DisplayDriver.h b/include/IECoreImage/DisplayDriver.h index fa5e09702a..165b551497 100644 --- a/include/IECoreImage/DisplayDriver.h +++ b/include/IECoreImage/DisplayDriver.h @@ -35,8 +35,7 @@ //! \file DisplayDriver.h /// Defines the DisplayDriver abstract base class. -#ifndef IECOREIMAGE_DISPLAYDRIVER_H -#define IECOREIMAGE_DISPLAYDRIVER_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -140,4 +139,3 @@ class IECOREIMAGE_API DisplayDriver : public IECore::RunTimeTyped #include "IECoreImage/DisplayDriver.inl" -#endif // IECOREIMAGE_DISPLAYDRIVER_H diff --git a/include/IECoreImage/DisplayDriver.inl b/include/IECoreImage/DisplayDriver.inl index 7d01164941..194339262c 100644 --- a/include/IECoreImage/DisplayDriver.inl +++ b/include/IECoreImage/DisplayDriver.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_DISPLAYDRIVER_INL -#define IECOREIMAGE_DISPLAYDRIVER_INL +#pragma once namespace IECoreImage { @@ -52,5 +51,3 @@ DisplayDriverPtr DisplayDriver::DisplayDriverDescription::creator( const Imat } // namespace IECoreImage - -#endif // IECOREIMAGE_DISPLAYDRIVER_INL diff --git a/include/IECoreImage/DisplayDriverServer.h b/include/IECoreImage/DisplayDriverServer.h index 7a14ba830a..163e339bce 100644 --- a/include/IECoreImage/DisplayDriverServer.h +++ b/include/IECoreImage/DisplayDriverServer.h @@ -35,8 +35,7 @@ //! \file DisplayDriverServer.h /// Defines the DisplayDriverServer class. -#ifndef IECOREIMAGE_DISPLAYDRIVERSERVER -#define IECOREIMAGE_DISPLAYDRIVERSERVER +#pragma once #include "IECoreImage/DisplayDriver.h" #include "IECoreImage/Export.h" @@ -108,5 +107,3 @@ class IECOREIMAGE_API DisplayDriverServer : public IECore::RunTimeTyped IE_CORE_DECLAREPTR( DisplayDriverServer ) } // namespace IECoreImage - -#endif // IECOREIMAGE_DISPLAYDRIVERSERVER diff --git a/include/IECoreImage/EnvMapSampler.h b/include/IECoreImage/EnvMapSampler.h index c665567034..b2de62af02 100644 --- a/include/IECoreImage/EnvMapSampler.h +++ b/include/IECoreImage/EnvMapSampler.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_ENVMAPSAMPLER_H -#define IECOREIMAGE_ENVMAPSAMPLER_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/ImagePrimitiveParameter.h" @@ -81,4 +80,3 @@ IE_CORE_DECLAREPTR( EnvMapSampler ); } // namespace IECoreImage -#endif // IECOREIMAGE_ENVMAPSAMPLER_H diff --git a/include/IECoreImage/Export.h b/include/IECoreImage/Export.h index 4f4d797e57..2b59e41172 100644 --- a/include/IECoreImage/Export.h +++ b/include/IECoreImage/Export.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_EXPORT_H -#define IECOREIMAGE_EXPORT_H +#pragma once #include "IECore/Export.h" @@ -45,5 +44,3 @@ #else #define IECOREIMAGE_API IECORE_IMPORT #endif - -#endif // #ifndef IECOREIMAGE_EXPORT_H diff --git a/include/IECoreImage/Font.h b/include/IECoreImage/Font.h index 576ea4af65..4a097da256 100644 --- a/include/IECoreImage/Font.h +++ b/include/IECoreImage/Font.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_FONT_H -#define IECOREIMAGE_FONT_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -102,4 +101,3 @@ IE_CORE_DECLAREPTR( Font ); } -#endif // IECOREIMAGE_FONT_H diff --git a/include/IECoreImage/HdrMergeOp.h b/include/IECoreImage/HdrMergeOp.h index 46a5eb8850..fe747b76e1 100644 --- a/include/IECoreImage/HdrMergeOp.h +++ b/include/IECoreImage/HdrMergeOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_HDRMERGEOP_H -#define IECOREIMAGE_HDRMERGEOP_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -88,4 +87,3 @@ IE_CORE_DECLAREPTR( HdrMergeOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_HDRMERGEOP_H diff --git a/include/IECoreImage/ImageCropOp.h b/include/IECoreImage/ImageCropOp.h index 53238e8fff..5d53105a11 100644 --- a/include/IECoreImage/ImageCropOp.h +++ b/include/IECoreImage/ImageCropOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGECROPOP_H -#define IECOREIMAGE_IMAGECROPOP_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -87,4 +86,3 @@ IE_CORE_DECLAREPTR( ImageCropOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_IMAGECROPOP_H diff --git a/include/IECoreImage/ImageDiffOp.h b/include/IECoreImage/ImageDiffOp.h index 2671f48d72..9feb5e21ef 100644 --- a/include/IECoreImage/ImageDiffOp.h +++ b/include/IECoreImage/ImageDiffOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGEDIFFOP_H -#define IECOREIMAGE_IMAGEDIFFOP_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/ImagePrimitiveParameter.h" @@ -103,4 +102,3 @@ IE_CORE_DECLAREPTR( ImageDiffOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_IMAGEDIFFOP_H diff --git a/include/IECoreImage/ImageDisplayDriver.h b/include/IECoreImage/ImageDisplayDriver.h index a3692df521..e556cc1ef9 100644 --- a/include/IECoreImage/ImageDisplayDriver.h +++ b/include/IECoreImage/ImageDisplayDriver.h @@ -35,8 +35,7 @@ //! \file ImageDisplayDriver.h /// Defines the ImageDisplayDriver class. -#ifndef IECOREIMAGE_IMAGEDISPLAYDRIVER -#define IECOREIMAGE_IMAGEDISPLAYDRIVER +#pragma once #include "IECoreImage/DisplayDriver.h" #include "IECoreImage/Export.h" @@ -96,5 +95,3 @@ class IECOREIMAGE_API ImageDisplayDriver : public DisplayDriver IE_CORE_DECLAREPTR( ImageDisplayDriver ) } // namespace IECore - -#endif // IE_CORE_IMAGEDISPLAYDRIVER diff --git a/include/IECoreImage/ImagePrimitive.h b/include/IECoreImage/ImagePrimitive.h index 4bcac278bb..5752f4008d 100644 --- a/include/IECoreImage/ImagePrimitive.h +++ b/include/IECoreImage/ImagePrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGEPRIMITIVE_H -#define IECOREIMAGE_IMAGEPRIMITIVE_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -209,4 +208,3 @@ IE_CORE_DECLAREPTR(ImagePrimitive); #include "IECoreImage/ImagePrimitive.inl" -#endif // IECOREIMAGE_IMAGEPRIMITIVE_H diff --git a/include/IECoreImage/ImagePrimitive.inl b/include/IECoreImage/ImagePrimitive.inl index 70081fb93f..a27cac0a1d 100644 --- a/include/IECoreImage/ImagePrimitive.inl +++ b/include/IECoreImage/ImagePrimitive.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGEPRIMITIVE_INL -#define IECOREIMAGE_IMAGEPRIMITIVE_INL +#pragma once #include "IECore/Exception.h" #include "IECore/Export.h" @@ -124,5 +123,3 @@ ImagePrimitivePtr ImagePrimitive::createGreyscale( const T fillValue, const Imat } - -#endif // IECOREIMAGE_IMAGEPRIMITIVE_INL diff --git a/include/IECoreImage/ImagePrimitiveParameter.h b/include/IECoreImage/ImagePrimitiveParameter.h index aada2ebd8d..b7c338a609 100644 --- a/include/IECoreImage/ImagePrimitiveParameter.h +++ b/include/IECoreImage/ImagePrimitiveParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGEPRIMITIVEPARAMETER_H -#define IECOREIMAGE_IMAGEPRIMITIVEPARAMETER_H +#pragma once #include "IECore/TypedObjectParameter.h" @@ -48,4 +47,3 @@ IE_CORE_DECLAREPTR( ImagePrimitiveParameter ); } // namespace IECoreImage -#endif // IECOREIMAGE_IMAGEPRIMITIVEPARAMETER_H diff --git a/include/IECoreImage/ImageReader.h b/include/IECoreImage/ImageReader.h index a3120fdb23..edfc7708b9 100644 --- a/include/IECoreImage/ImageReader.h +++ b/include/IECoreImage/ImageReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGEREADER_H -#define IECOREIMAGE_IMAGEREADER_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -133,4 +132,3 @@ IE_CORE_DECLAREPTR(ImageReader); } // namespace IECoreImage -#endif // IECOREIMAGE_IMAGEREADER_H diff --git a/include/IECoreImage/ImageThinner.h b/include/IECoreImage/ImageThinner.h index 270deda989..0ffb588e81 100644 --- a/include/IECoreImage/ImageThinner.h +++ b/include/IECoreImage/ImageThinner.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGETHINNER_H -#define IECOREIMAGE_IMAGETHINNER_H +#pragma once #include "IECoreImage/ChannelOp.h" #include "IECoreImage/Export.h" @@ -85,5 +84,4 @@ IE_CORE_DECLAREPTR( ImageThinner ); } // namespace IECoreImage -#endif // IECOREIMAGE_IMAGETHINNER_H diff --git a/include/IECoreImage/ImageWriter.h b/include/IECoreImage/ImageWriter.h index c5b3911562..4b74748832 100644 --- a/include/IECoreImage/ImageWriter.h +++ b/include/IECoreImage/ImageWriter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGEWRITER_H -#define IECOREIMAGE_IMAGEWRITER_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -112,4 +111,3 @@ IE_CORE_DECLAREPTR(ImageWriter); } // namespace IECoreImage -#endif // IECOREIMAGE_IMAGEWRITER_H diff --git a/include/IECoreImage/LensDistortOp.h b/include/IECoreImage/LensDistortOp.h index d4e6d69d4d..f08c2f8d05 100644 --- a/include/IECoreImage/LensDistortOp.h +++ b/include/IECoreImage/LensDistortOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_LENSDISTORT_H -#define IECOREIMAGE_LENSDISTORT_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -89,5 +88,4 @@ IE_CORE_DECLAREPTR( LensDistortOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_LENSDISTORT_H diff --git a/include/IECoreImage/LuminanceOp.h b/include/IECoreImage/LuminanceOp.h index f28bd6b1f0..299277ebc4 100644 --- a/include/IECoreImage/LuminanceOp.h +++ b/include/IECoreImage/LuminanceOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_LUMINANCEOP_H -#define IECOREIMAGE_LUMINANCEOP_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -99,4 +98,3 @@ IE_CORE_DECLAREPTR( LuminanceOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_LUMINANCEOP_H diff --git a/include/IECoreImage/MPlayDisplayDriver.h b/include/IECoreImage/MPlayDisplayDriver.h index f7a6baafee..c73bb51af8 100644 --- a/include/IECoreImage/MPlayDisplayDriver.h +++ b/include/IECoreImage/MPlayDisplayDriver.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_MPLAYDISPLAYDRIVER_H -#define IECOREIMAGE_MPLAYDISPLAYDRIVER_H +#pragma once #include "IECoreImage/DisplayDriver.h" #include "IECoreImage/Export.h" @@ -83,4 +82,3 @@ IE_CORE_DECLAREPTR( MPlayDisplayDriver ) } // namespace IECoreImage -#endif // IECOREIMAGE_MPLAYDISPLAYDRIVER_H diff --git a/include/IECoreImage/MedianCutSampler.h b/include/IECoreImage/MedianCutSampler.h index 0b568f6352..e20b2ff445 100644 --- a/include/IECoreImage/MedianCutSampler.h +++ b/include/IECoreImage/MedianCutSampler.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_MEDIANCUTSAMPLER_H -#define IECOREIMAGE_MEDIANCUTSAMPLER_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/ImagePrimitiveParameter.h" @@ -99,4 +98,3 @@ IE_CORE_DECLAREPTR( MedianCutSampler ); } // namespace IECoreImage -#endif // IECOREIMAGE_MEDIANCUTSAMPLER_H diff --git a/include/IECoreImage/OpenImageIOAlgo.h b/include/IECoreImage/OpenImageIOAlgo.h index fee8e323c9..4f5fc5112e 100644 --- a/include/IECoreImage/OpenImageIOAlgo.h +++ b/include/IECoreImage/OpenImageIOAlgo.h @@ -35,8 +35,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_OIIOALGO_H -#define IECOREIMAGE_OIIOALGO_H +#pragma once #include "IECoreImage/Export.h" @@ -102,4 +101,3 @@ IECOREIMAGE_API IECore::DataPtr data( const OIIO::ParamValue &value ); } // namespace IECoreImage -#endif // IECOREIMAGE_OIIOALGO_H diff --git a/include/IECoreImage/Private/DisplayDriverServerHeader.h b/include/IECoreImage/Private/DisplayDriverServerHeader.h index ed478466dc..2d899e7fc2 100644 --- a/include/IECoreImage/Private/DisplayDriverServerHeader.h +++ b/include/IECoreImage/Private/DisplayDriverServerHeader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_DISPLAYDRIVERSERVERHEADER -#define IECOREIMAGE_DISPLAYDRIVERSERVERHEADER +#pragma once #include "IECoreImage/DisplayDriverServer.h" @@ -81,5 +80,3 @@ class DisplayDriverServerHeader }; } // namespace IECoreImage - -#endif // IECOREIMAGE_DISPLAYDRIVERSERVERHEADER diff --git a/include/IECoreImage/SplineToImage.h b/include/IECoreImage/SplineToImage.h index b8619fbc06..09c06bfc87 100644 --- a/include/IECoreImage/SplineToImage.h +++ b/include/IECoreImage/SplineToImage.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_SPLINETOIMAGE_H -#define IECOREIMAGE_SPLINETOIMAGE_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -89,4 +88,3 @@ IE_CORE_DECLAREPTR( SplineToImage ); } // namespace IECoreImage -#endif // IECOREIMAGE_SPLINETOIMAGE_H diff --git a/include/IECoreImage/SummedAreaOp.h b/include/IECoreImage/SummedAreaOp.h index c1a487e9c7..98d4dc4056 100644 --- a/include/IECoreImage/SummedAreaOp.h +++ b/include/IECoreImage/SummedAreaOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_SUMMEDAREAOP_H -#define IECOREIMAGE_SUMMEDAREAOP_H +#pragma once #include "IECoreImage/ChannelOp.h" #include "IECoreImage/Export.h" @@ -67,5 +66,4 @@ IE_CORE_DECLAREPTR( SummedAreaOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_SUMMEDAREAOP_H diff --git a/include/IECoreImage/TypeIds.h b/include/IECoreImage/TypeIds.h index d335af7b80..0b5ca1d1eb 100644 --- a/include/IECoreImage/TypeIds.h +++ b/include/IECoreImage/TypeIds.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_TYPEIDS_H -#define IECOREIMAGE_TYPEIDS_H +#pragma once namespace IECoreImage { @@ -70,4 +69,3 @@ enum TypeId } // namespace IECoreImage -#endif // IECOREIMAGE_TYPEIDS_H diff --git a/include/IECoreImage/WarpOp.h b/include/IECoreImage/WarpOp.h index c2688466a8..e0758c89fa 100644 --- a/include/IECoreImage/WarpOp.h +++ b/include/IECoreImage/WarpOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_WARPOP_H -#define IECOREIMAGE_WARPOP_H +#pragma once #include "IECoreImage/Export.h" #include "IECoreImage/TypeIds.h" @@ -100,4 +99,3 @@ IE_CORE_DECLAREPTR( WarpOp ); } // namespace IECoreImage -#endif // IECOREIMAGE_WARPOP_H diff --git a/include/IECoreImageBindings/ChannelOpBinding.h b/include/IECoreImageBindings/ChannelOpBinding.h index 201da2d013..0b5ad3639c 100644 --- a/include/IECoreImageBindings/ChannelOpBinding.h +++ b/include/IECoreImageBindings/ChannelOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_CHANNELOPBINDING_H -#define IECOREIMAGEBINDINGS_CHANNELOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindChannelOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_CHANNELOPBINDING_H diff --git a/include/IECoreImageBindings/ClampOpBinding.h b/include/IECoreImageBindings/ClampOpBinding.h index bf716dc013..f9246c5dd2 100644 --- a/include/IECoreImageBindings/ClampOpBinding.h +++ b/include/IECoreImageBindings/ClampOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_CLAMPOPBINDING_H -#define IECOREIMAGEBINDINGS_CLAMPOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindClampOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_CLAMPOPBINDING_H diff --git a/include/IECoreImageBindings/ClientDisplayDriverBinding.h b/include/IECoreImageBindings/ClientDisplayDriverBinding.h index a053e0869e..6a96a7fdde 100644 --- a/include/IECoreImageBindings/ClientDisplayDriverBinding.h +++ b/include/IECoreImageBindings/ClientDisplayDriverBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_CLIENTDISPLAYDRIVERBINDING_H -#define IECOREIMAGEBINDINGS_CLIENTDISPLAYDRIVERBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindClientDisplayDriver(); } -#endif // IECOREIMAGEBINDINGS_CLIENTDISPLAYDRIVERBINDING_H diff --git a/include/IECoreImageBindings/ColorAlgoBinding.h b/include/IECoreImageBindings/ColorAlgoBinding.h index 9ce9f0c3c8..b78b5b7c2f 100644 --- a/include/IECoreImageBindings/ColorAlgoBinding.h +++ b/include/IECoreImageBindings/ColorAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_COLORALGOBINDING_H -#define IECOREIMAGEBINDINGS_COLORALGOBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindColorAlgo(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_COLORALGOBINDING_H diff --git a/include/IECoreImageBindings/DisplayDriverBinding.h b/include/IECoreImageBindings/DisplayDriverBinding.h index 766fa345ba..e4c39fed02 100644 --- a/include/IECoreImageBindings/DisplayDriverBinding.h +++ b/include/IECoreImageBindings/DisplayDriverBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_DISPLAYDRIVERBINDING_H -#define IECOREIMAGEBINDINGS_DISPLAYDRIVERBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindDisplayDriver(); } -#endif // IECOREIMAGEBINDINGS_DISPLAYDRIVERBINDING_H diff --git a/include/IECoreImageBindings/DisplayDriverServerBinding.h b/include/IECoreImageBindings/DisplayDriverServerBinding.h index 56c89ca7cc..f69c9829dd 100644 --- a/include/IECoreImageBindings/DisplayDriverServerBinding.h +++ b/include/IECoreImageBindings/DisplayDriverServerBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_DISPLAYDRIVERSERVERBINDING_H -#define IECOREIMAGEBINDINGS_DISPLAYDRIVERSERVERBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindDisplayDriverServer(); } -#endif // IECOREIMAGEBINDINGS_DISPLAYDRIVERSERVERBINDING_H diff --git a/include/IECoreImageBindings/EnvMapSamplerBinding.h b/include/IECoreImageBindings/EnvMapSamplerBinding.h index 0765e5146c..6611f8fe6b 100644 --- a/include/IECoreImageBindings/EnvMapSamplerBinding.h +++ b/include/IECoreImageBindings/EnvMapSamplerBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_ENVMAPSAMPLERBINDING_H -#define IECOREIMAGEBINDINGS_ENVMAPSAMPLERBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindEnvMapSampler(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_ENVMAPSAMPLERBINDING_H diff --git a/include/IECoreImageBindings/FontBinding.h b/include/IECoreImageBindings/FontBinding.h index d989ff571e..a19e488b4c 100644 --- a/include/IECoreImageBindings/FontBinding.h +++ b/include/IECoreImageBindings/FontBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_FONTBINDING_H -#define IECOREIMAGE_FONTBINDING_H +#pragma once namespace IECoreImageBindings { void bindFont(); } // namespace IECoreImageBindings -#endif // IECOREIMAGE_FONTBINDING_H diff --git a/include/IECoreImageBindings/HdrMergeOpBinding.h b/include/IECoreImageBindings/HdrMergeOpBinding.h index 7125d394b1..fbc1221e3f 100644 --- a/include/IECoreImageBindings/HdrMergeOpBinding.h +++ b/include/IECoreImageBindings/HdrMergeOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_HDRMERGEOPBINDING_H -#define IECOREIMAGEBINDINGS_HDRMERGEOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindHdrMergeOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_HDRMERGEOPBINDING_H diff --git a/include/IECoreImageBindings/ImageCropOpBinding.h b/include/IECoreImageBindings/ImageCropOpBinding.h index 97274aff0c..d274286989 100644 --- a/include/IECoreImageBindings/ImageCropOpBinding.h +++ b/include/IECoreImageBindings/ImageCropOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_IMAGECROPOPBINDING_H -#define IECOREIMAGEBINDINGS_IMAGECROPOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindImageCropOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_IMAGECROPOPBINDING_H diff --git a/include/IECoreImageBindings/ImageDiffOpBinding.h b/include/IECoreImageBindings/ImageDiffOpBinding.h index 58aae6bf7a..86536b2399 100644 --- a/include/IECoreImageBindings/ImageDiffOpBinding.h +++ b/include/IECoreImageBindings/ImageDiffOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_IMAGEDIFFOPBINDING_H -#define IECOREIMAGEBINDINGS_IMAGEDIFFOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindImageDiffOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_IMAGEDIFFOPBINDING_H diff --git a/include/IECoreImageBindings/ImageDisplayDriverBinding.h b/include/IECoreImageBindings/ImageDisplayDriverBinding.h index 5dce41ed5f..74a8d5c79d 100644 --- a/include/IECoreImageBindings/ImageDisplayDriverBinding.h +++ b/include/IECoreImageBindings/ImageDisplayDriverBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_IMAGEDISPLAYDRIVERBINDING_H -#define IECOREIMAGEBINDINGS_IMAGEDISPLAYDRIVERBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindImageDisplayDriver(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_IMAGEDISPLAYDRIVERBINDING_H diff --git a/include/IECoreImageBindings/ImagePrimitiveBinding.h b/include/IECoreImageBindings/ImagePrimitiveBinding.h index 075a42305e..178827bfec 100644 --- a/include/IECoreImageBindings/ImagePrimitiveBinding.h +++ b/include/IECoreImageBindings/ImagePrimitiveBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_IMAGEPRIMITIVEBINDING_H -#define IECOREIMAGEBINDINGS_IMAGEPRIMITIVEBINDING_H +#pragma once namespace IECoreImageBindings { void bindImagePrimitive(); } -#endif // IECOREIMAGEBINDINGS_IMAGEPRIMITIVEBINDING_H diff --git a/include/IECoreImageBindings/ImagePrimitiveParameterBinding.h b/include/IECoreImageBindings/ImagePrimitiveParameterBinding.h index fe3f9a074c..d8d9e3dd8b 100644 --- a/include/IECoreImageBindings/ImagePrimitiveParameterBinding.h +++ b/include/IECoreImageBindings/ImagePrimitiveParameterBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGE_IMAGEPRIMITIVEPARAMETERBINDING_H -#define IECOREIMAGE_IMAGEPRIMITIVEPARAMETERBINDING_H +#pragma once namespace IECoreImageBindings { void bindImagePrimitiveParameter(); } -#endif // IECOREIMAGE_IMAGEPRIMITIVEPARAMETERBINDING_H diff --git a/include/IECoreImageBindings/ImageReaderBinding.h b/include/IECoreImageBindings/ImageReaderBinding.h index 1b629bd865..57736cca8f 100644 --- a/include/IECoreImageBindings/ImageReaderBinding.h +++ b/include/IECoreImageBindings/ImageReaderBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_IMAGEREADERBINDING_H -#define IECOREIMAGEBINDINGS_IMAGEREADERBINDING_H +#pragma once namespace IECoreImageBindings { void bindImageReader(); } -#endif // IECOREIMAGEBINDINGS_IMAGEREADERBINDING_H diff --git a/include/IECoreImageBindings/ImageThinnerBinding.h b/include/IECoreImageBindings/ImageThinnerBinding.h index 1406eb65fb..22c46b02b9 100644 --- a/include/IECoreImageBindings/ImageThinnerBinding.h +++ b/include/IECoreImageBindings/ImageThinnerBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_IMAGETHINNERBINDING_H -#define IECOREIMAGEBINDINGS_IMAGETHINNERBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindImageThinner(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_IMAGETHINNERBINDING_H diff --git a/include/IECoreImageBindings/ImageWriterBinding.h b/include/IECoreImageBindings/ImageWriterBinding.h index 56e86cb34e..d72c69e8eb 100644 --- a/include/IECoreImageBindings/ImageWriterBinding.h +++ b/include/IECoreImageBindings/ImageWriterBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_IMAGEWRITERBINDING_H -#define IECOREIMAGEBINDINGS_IMAGEWRITERBINDING_H +#pragma once namespace IECoreImageBindings { void bindImageWriter(); } -#endif // IECOREIMAGEBINDINGS_IMAGEWRITERBINDING_H diff --git a/include/IECoreImageBindings/LensDistortOpBinding.h b/include/IECoreImageBindings/LensDistortOpBinding.h index 67f30ac7d3..2cd68b53a1 100644 --- a/include/IECoreImageBindings/LensDistortOpBinding.h +++ b/include/IECoreImageBindings/LensDistortOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_LENSDISTORTOPBINDING_H -#define IECOREIMAGEBINDINGS_LENSDISTORTOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindLensDistortOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_LENSDISTORTOPBINDING_H diff --git a/include/IECoreImageBindings/LuminanceOpBinding.h b/include/IECoreImageBindings/LuminanceOpBinding.h index 9b21b24985..d054f01093 100644 --- a/include/IECoreImageBindings/LuminanceOpBinding.h +++ b/include/IECoreImageBindings/LuminanceOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_LUMINANCEOPBINDING_H -#define IECOREIMAGEBINDINGS_LUMINANCEOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindLuminanceOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_LUMINANCEOPBINDING_H diff --git a/include/IECoreImageBindings/MPlayDisplayDriverBinding.h b/include/IECoreImageBindings/MPlayDisplayDriverBinding.h index b24b5b0b1e..e06f4fd072 100644 --- a/include/IECoreImageBindings/MPlayDisplayDriverBinding.h +++ b/include/IECoreImageBindings/MPlayDisplayDriverBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_MPLAYDISPLAYDRIVERBINDING_H -#define IECOREIMAGEBINDINGS_MPLAYDISPLAYDRIVERBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindMPlayDisplayDriver(); } -#endif // IECOREIMAGEBINDINGS_MPLAYDISPLAYDRIVERBINDING_H diff --git a/include/IECoreImageBindings/MedianCutSamplerBinding.h b/include/IECoreImageBindings/MedianCutSamplerBinding.h index 80e8a1c2b6..ca216fec0e 100644 --- a/include/IECoreImageBindings/MedianCutSamplerBinding.h +++ b/include/IECoreImageBindings/MedianCutSamplerBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_MEDIANCUTSAMPLERBINDING_H -#define IECOREIMAGEBINDINGS_MEDIANCUTSAMPLERBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindMedianCutSampler(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_MEDIANCUTSAMPLERBINDING_H diff --git a/include/IECoreImageBindings/SplineToImageBinding.h b/include/IECoreImageBindings/SplineToImageBinding.h index 23cbdc2b0d..cce07bc5f0 100644 --- a/include/IECoreImageBindings/SplineToImageBinding.h +++ b/include/IECoreImageBindings/SplineToImageBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_SPLINETOIMAGEBINDING_H -#define IECOREIMAGEBINDINGS_SPLINETOIMAGEBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindSplineToImage(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_SPLINETOIMAGEBINDING_H diff --git a/include/IECoreImageBindings/SummedAreaOpBinding.h b/include/IECoreImageBindings/SummedAreaOpBinding.h index 57d2c84fd1..049d9f739c 100644 --- a/include/IECoreImageBindings/SummedAreaOpBinding.h +++ b/include/IECoreImageBindings/SummedAreaOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_SUMMEDAREAOPBINDING_H -#define IECOREIMAGEBINDINGS_SUMMEDAREAOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindSummedAreaOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_SUMMEDAREAOPBINDING_H diff --git a/include/IECoreImageBindings/WarpOpBinding.h b/include/IECoreImageBindings/WarpOpBinding.h index 1bc4c0e2ca..22f1e6d635 100644 --- a/include/IECoreImageBindings/WarpOpBinding.h +++ b/include/IECoreImageBindings/WarpOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREIMAGEBINDINGS_WARPOPBINDING_H -#define IECOREIMAGEBINDINGS_WARPOPBINDING_H +#pragma once namespace IECoreImageBindings { @@ -42,4 +41,3 @@ void bindWarpOp(); } // namespace IECoreImageBindings -#endif // IECOREIMAGEBINDINGS_WARPOPBINDING_H diff --git a/include/IECorePython/AngleConversionBinding.h b/include/IECorePython/AngleConversionBinding.h index 69d7eb7b7d..5b3c17a1e0 100644 --- a/include/IECorePython/AngleConversionBinding.h +++ b/include/IECorePython/AngleConversionBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_ANGLECONVERSIONBINDING_H -#define IECOREPYTHON_ANGLECONVERSIONBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindAngleConversion(); } -#endif // IECOREPYTHON_ANGLECONVERSIONBINDING_H diff --git a/include/IECorePython/BezierAlgoBinding.h b/include/IECorePython/BezierAlgoBinding.h index d1ab5bea37..d84952bf3b 100644 --- a/include/IECorePython/BezierAlgoBinding.h +++ b/include/IECorePython/BezierAlgoBinding.h @@ -34,8 +34,7 @@ #include "IECorePython/Export.h" -#ifndef IECOREPYTHON_BEZIERALGOBINDING_H -#define IECOREPYTHON_BEZIERALGOBINDING_H +#pragma once namespace IECorePython { @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindBezierAlgo(); } // namespace IECorePython -#endif // IECOREPYTHON_BEZIERALGOBINDING_H diff --git a/include/IECorePython/BinaryFrameListBinding.h b/include/IECorePython/BinaryFrameListBinding.h index 43bc8e432e..94ebdba9e9 100644 --- a/include/IECorePython/BinaryFrameListBinding.h +++ b/include/IECorePython/BinaryFrameListBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_BINARYFRAMELISTBINDING_H -#define IECOREPYTHON_BINARYFRAMELISTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindBinaryFrameList(); } -#endif // IECOREPYTHON_BINARYFRAMELISTBINDING_H diff --git a/include/IECorePython/BlindDataHolderBinding.h b/include/IECorePython/BlindDataHolderBinding.h index 5abfe3463b..a47ec2a09d 100644 --- a/include/IECorePython/BlindDataHolderBinding.h +++ b/include/IECorePython/BlindDataHolderBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_BLINDDATAHOLDERBINDING_H -#define IECOREPYTHON_BLINDDATAHOLDERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindBlindDataHolder(); } -#endif // IECOREPYTHON_BLINDDATAHOLDERBINDING_H diff --git a/include/IECorePython/BoundedKDTreeBinding.h b/include/IECorePython/BoundedKDTreeBinding.h index af2aeb2bf3..80b799b9c3 100644 --- a/include/IECorePython/BoundedKDTreeBinding.h +++ b/include/IECorePython/BoundedKDTreeBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_BOUNDEDKDTREEBINDING_H -#define IECOREPYTHON_BOUNDEDKDTREEBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindBoundedKDTree(); } -#endif // IECOREPYTHON_BOUNDEDKDTREEBINDING_H diff --git a/include/IECorePython/BoxAlgoBinding.h b/include/IECorePython/BoxAlgoBinding.h index 33817fbafb..953104abed 100644 --- a/include/IECorePython/BoxAlgoBinding.h +++ b/include/IECorePython/BoxAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_BOXALGOBINDING_H -#define IECOREPYTHON_BOXALGOBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindBoxAlgo(); } // namespace IECorePython -#endif // IECOREPYTHON_BOXALGOBINDING_H diff --git a/include/IECorePython/BoxTypedParameterBinding.h b/include/IECorePython/BoxTypedParameterBinding.h index 164f9d6ea0..d080a08467 100644 --- a/include/IECorePython/BoxTypedParameterBinding.h +++ b/include/IECorePython/BoxTypedParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_BOXTYPEDPARAMETERBINDING_H -#define IECOREPYTHON_BOXTYPEDPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindBoxTypedParameter(); } -#endif // IECOREPYTHON_BOXTYPEDPARAMETERBINDING_H diff --git a/include/IECorePython/CachedReaderBinding.h b/include/IECorePython/CachedReaderBinding.h index 28c7e4fe2a..f941c69a61 100644 --- a/include/IECorePython/CachedReaderBinding.h +++ b/include/IECorePython/CachedReaderBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_CACHEDREADERBINDING_H -#define IECOREPYTHON_CACHEDREADERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindCachedReader(); } -#endif // IECOREPYTHON_CACHEDREADERBINDING_H diff --git a/include/IECorePython/CamelCaseBinding.h b/include/IECorePython/CamelCaseBinding.h index 394ea416f6..625435989e 100644 --- a/include/IECorePython/CamelCaseBinding.h +++ b/include/IECorePython/CamelCaseBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_CAMELCASEBINDING_H -#define IECOREPYTHON_CAMELCASEBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindCamelCase(); } // namespace IECorePython -#endif // IECOREPYTHON_CAMELCASEBINDING_H diff --git a/include/IECorePython/CancellerBinding.h b/include/IECorePython/CancellerBinding.h index f9664bea75..2c5b984683 100644 --- a/include/IECorePython/CancellerBinding.h +++ b/include/IECorePython/CancellerBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_CANCELLERBINDING_H -#define IECOREPYTHON_CANCELLERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindCanceller(); } // namespace IECorePython -#endif // IECOREPYTHON_CANCELLERBINDING_H diff --git a/include/IECorePython/CheckedGILRelease.h b/include/IECorePython/CheckedGILRelease.h index 2fd5cef7af..e2f64f1f60 100644 --- a/include/IECorePython/CheckedGILRelease.h +++ b/include/IECorePython/CheckedGILRelease.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_CHECKEDGILRELEASE_H -#define IECOREPYTHON_CHECKEDGILRELEASE_H +#pragma once #include "boost/python.hpp" @@ -63,4 +62,3 @@ class IECOREPYTHON_API CheckedGILRelease : boost::noncopyable } // namespace IECorePython -#endif // IECOREPYTHON_CHECKEDGILRELEASE_H diff --git a/include/IECorePython/ColorTypedParameterBinding.h b/include/IECorePython/ColorTypedParameterBinding.h index 2bc898d7dd..1be6633768 100644 --- a/include/IECorePython/ColorTypedParameterBinding.h +++ b/include/IECorePython/ColorTypedParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_COLORTYPEDPARAMETERBINDING_H -#define IECOREPYTHON_COLORTYPEDPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindColorTypedParameter(); } -#endif // IECOREPYTHON_COLORTYPEDPARAMETERBINDING_H diff --git a/include/IECorePython/CompoundDataBinding.h b/include/IECorePython/CompoundDataBinding.h index 9e7a5f5c96..047bab2915 100644 --- a/include/IECorePython/CompoundDataBinding.h +++ b/include/IECorePython/CompoundDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_COMPOUNDDATABINDING_H -#define IECOREPYTHON_COMPOUNDDATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindCompoundData(); } -#endif // IECOREPYTHON_COMPOUNDDATABINDING_H diff --git a/include/IECorePython/CompoundFrameListBinding.h b/include/IECorePython/CompoundFrameListBinding.h index 60a6aa4d48..5bf80cc5db 100644 --- a/include/IECorePython/CompoundFrameListBinding.h +++ b/include/IECorePython/CompoundFrameListBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_COMPOUNDFRAMELISTBINDING_H -#define IECOREPYTHON_COMPOUNDFRAMELISTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindCompoundFrameList(); } -#endif // IECOREPYTHON_COMPOUNDFRAMELISTBINDING_H diff --git a/include/IECorePython/CompoundObjectBinding.h b/include/IECorePython/CompoundObjectBinding.h index b5f7c46325..35cb7bae66 100644 --- a/include/IECorePython/CompoundObjectBinding.h +++ b/include/IECorePython/CompoundObjectBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_COMPOUNDOBJECTBINDING_H -#define IECOREPYTHON_COMPOUNDOBJECTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindCompoundObject(); } -#endif // IECOREPYTHON_COMPOUNDOBJECTBINDING_H diff --git a/include/IECorePython/CompoundParameterBinding.h b/include/IECorePython/CompoundParameterBinding.h index 1087c441ed..ddb9866848 100644 --- a/include/IECorePython/CompoundParameterBinding.h +++ b/include/IECorePython/CompoundParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_COMPOUNDPARAMETERBINDING_H -#define IECOREPYTHON_COMPOUNDPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindCompoundParameter(); } -#endif // IECOREPYTHON_COMPOUNDPARAMETERBINDING_H diff --git a/include/IECorePython/ConverterBinding.h b/include/IECorePython/ConverterBinding.h index 389ce82b7c..f9e646ea63 100644 --- a/include/IECorePython/ConverterBinding.h +++ b/include/IECorePython/ConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_CONVERTERBINDING_H -#define IECOREPYTHON_CONVERTERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindConverter(); } -#endif // IECOREPYTHON_CONVERTERBINDING_H diff --git a/include/IECorePython/CubicBasisBinding.h b/include/IECorePython/CubicBasisBinding.h index e535eccd9a..edcf6710af 100644 --- a/include/IECorePython/CubicBasisBinding.h +++ b/include/IECorePython/CubicBasisBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_CUBICBASISBINDING_H -#define IECOREPYTHON_CUBICBASISBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindCubicBasis(); } -#endif // IECOREPYTHON_CUBICBASISBINDING_H diff --git a/include/IECorePython/DataAlgoBinding.h b/include/IECorePython/DataAlgoBinding.h index d146da0120..78a3e39fe0 100644 --- a/include/IECorePython/DataAlgoBinding.h +++ b/include/IECorePython/DataAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DATAALGOBINDING_H -#define IECOREPYTHON_DATAALGOBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindDataAlgo(); } -#endif // IECOREPYTHON_DATAALGOBINDING_H diff --git a/include/IECorePython/DataBinding.h b/include/IECorePython/DataBinding.h index 9d4277a516..391a9642d9 100644 --- a/include/IECorePython/DataBinding.h +++ b/include/IECorePython/DataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DATABINDING_H -#define IECOREPYTHON_DATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindData(); } -#endif // IECOREPYTHON_DATABINDING_H diff --git a/include/IECorePython/DataCastOpBinding.h b/include/IECorePython/DataCastOpBinding.h index bfdeddc683..9f5919e26e 100644 --- a/include/IECorePython/DataCastOpBinding.h +++ b/include/IECorePython/DataCastOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DATACASTOPBINDING_H -#define IECOREPYTHON_DATACASTOPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindDataCastOp(); } -#endif // IECOREPYTHON_DATACASTOPBINDING_H diff --git a/include/IECorePython/DataConvertOpBinding.h b/include/IECorePython/DataConvertOpBinding.h index c10fc52047..cee9661c31 100644 --- a/include/IECorePython/DataConvertOpBinding.h +++ b/include/IECorePython/DataConvertOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DATACONVERTOPBINDING_H -#define IECOREPYTHON_DATACONVERTOPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindDataConvertOp(); } -#endif // IECOREPYTHON_DATACONVERTOPBINDING_H diff --git a/include/IECorePython/DataInterleaveOpBinding.h b/include/IECorePython/DataInterleaveOpBinding.h index bd71b6b4ec..88c8249a85 100644 --- a/include/IECorePython/DataInterleaveOpBinding.h +++ b/include/IECorePython/DataInterleaveOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DATAINTERLEAVEOPBINDING_H -#define IECOREPYTHON_DATAINTERLEAVEOPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindDataInterleaveOp(); } -#endif // IECOREPYTHON_DATAINTERLEAVEOPBINDING_H diff --git a/include/IECorePython/DataPromoteOpBinding.h b/include/IECorePython/DataPromoteOpBinding.h index 83562ae05a..acb9610353 100644 --- a/include/IECorePython/DataPromoteOpBinding.h +++ b/include/IECorePython/DataPromoteOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DATAPROMOTEOPBINDING_H -#define IECOREPYTHON_DATAPROMOTEOPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindDataPromoteOp(); } -#endif // IECOREPYTHON_DATAPROMOTEOPBINDING_H diff --git a/include/IECorePython/DateTimeDataBinding.h b/include/IECorePython/DateTimeDataBinding.h index 5ca598a5dd..2facf99c4c 100644 --- a/include/IECorePython/DateTimeDataBinding.h +++ b/include/IECorePython/DateTimeDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DATETIMEDATABINDING_H -#define IECOREPYTHON_DATETIMEDATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindDateTimeData(); } -#endif // IECOREPYTHON_DATETIMEDATABINDING_H diff --git a/include/IECorePython/DateTimeParameterBinding.h b/include/IECorePython/DateTimeParameterBinding.h index 7f0458acb5..42044455bf 100644 --- a/include/IECorePython/DateTimeParameterBinding.h +++ b/include/IECorePython/DateTimeParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DATETIMEPARAMETERBINDING_H -#define IECOREPYTHON_DATETIMEPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindDateTimeParameter(); } -#endif // IECOREPYTHON_DATETIMEPARAMETERBINDING_H diff --git a/include/IECorePython/DirNameParameterBinding.h b/include/IECorePython/DirNameParameterBinding.h index e27068d355..8475396b7e 100644 --- a/include/IECorePython/DirNameParameterBinding.h +++ b/include/IECorePython/DirNameParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_DIRNAMEPARAMETERBINDING_H -#define IECOREPYTHON_DIRNAMEPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindDirNameParameter(); } -#endif // IECOREPYTHON_DIRNAMEPARAMETERBINDING_H diff --git a/include/IECorePython/EmptyFrameListBinding.h b/include/IECorePython/EmptyFrameListBinding.h index 89e81a7922..37ef36cfee 100644 --- a/include/IECorePython/EmptyFrameListBinding.h +++ b/include/IECorePython/EmptyFrameListBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_EMPTYFRAMELISTBINDING_H -#define IECOREPYTHON_EMPTYFRAMELISTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindEmptyFrameList(); } -#endif // IECOREPYTHON_EMPTYFRAMELISTBINDING_H diff --git a/include/IECorePython/ExceptionAlgo.h b/include/IECorePython/ExceptionAlgo.h index 9a2e1c2e9c..97f3dc34e6 100644 --- a/include/IECorePython/ExceptionAlgo.h +++ b/include/IECorePython/ExceptionAlgo.h @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_EXCEPTIONALGO_H -#define IECOREPYTHON_EXCEPTIONALGO_H +#pragma once #include "IECorePython/Export.h" @@ -61,4 +60,3 @@ IECOREPYTHON_API std::string formatPythonException( bool withStacktrace = true, } // namespace IECorePython -#endif // IECOREPYTHON_EXCEPTIONALGO_H diff --git a/include/IECorePython/ExceptionBinding.h b/include/IECorePython/ExceptionBinding.h index 7dd76bead2..fe16766e47 100644 --- a/include/IECorePython/ExceptionBinding.h +++ b/include/IECorePython/ExceptionBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_EXCEPTIONBINDING_H -#define IECOREPYTHON_EXCEPTIONBINDING_H +#pragma once #include "boost/python.hpp" @@ -66,6 +65,5 @@ IECOREPYTHON_API void bindException(); } -#endif // IECOREPYTHON_EXCEPTIONBINDING_H -#include "IECorePython/ExceptionBinding.inl" \ No newline at end of file +#include "IECorePython/ExceptionBinding.inl" diff --git a/include/IECorePython/ExceptionBinding.inl b/include/IECorePython/ExceptionBinding.inl index b3b9240c27..994359867d 100644 --- a/include/IECorePython/ExceptionBinding.inl +++ b/include/IECorePython/ExceptionBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_EXCEPTIONBINDING_INL -#define IECOREPYTHON_EXCEPTIONBINDING_INL +#pragma once #include "boost/python/raw_function.hpp" @@ -170,5 +169,3 @@ ExceptionClass &ExceptionClass::def( Args&&... args ) } } // namespace IECorePython - -#endif // IECOREPYTHON_EXCEPTIONBINDING_INL diff --git a/include/IECorePython/ExclusionFrameListBinding.h b/include/IECorePython/ExclusionFrameListBinding.h index 2fc45efc8d..1eb60d7719 100644 --- a/include/IECorePython/ExclusionFrameListBinding.h +++ b/include/IECorePython/ExclusionFrameListBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_EXCLUSIONFRAMELISTBINDING_H -#define IECOREPYTHON_EXCLUSIONFRAMELISTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindExclusionFrameList(); } -#endif // IECOREPYTHON_EXCLUSIONFRAMELISTBINDING_H diff --git a/include/IECorePython/Export.h b/include/IECorePython/Export.h index 896acc2665..11748fc6ef 100644 --- a/include/IECorePython/Export.h +++ b/include/IECorePython/Export.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_EXPORT_H -#define IECOREPYTHON_EXPORT_H +#pragma once #include "IECore/Export.h" @@ -46,5 +45,3 @@ #else #define IECOREPYTHON_API IECORE_IMPORT #endif - -#endif // #ifndef IECOREPYTHON_EXPORT_H diff --git a/include/IECorePython/FileNameParameterBinding.h b/include/IECorePython/FileNameParameterBinding.h index 86321259a2..5424ff6379 100644 --- a/include/IECorePython/FileNameParameterBinding.h +++ b/include/IECorePython/FileNameParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FILENAMEPARAMETERBINDING_H -#define IECOREPYTHON_FILENAMEPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindFileNameParameter(); } -#endif // IECOREPYTHON_FILENAMEPARAMETERBINDING_H diff --git a/include/IECorePython/FileSequenceBinding.h b/include/IECorePython/FileSequenceBinding.h index f2ddf99e6b..a543da9dc4 100644 --- a/include/IECorePython/FileSequenceBinding.h +++ b/include/IECorePython/FileSequenceBinding.h @@ -33,8 +33,7 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FILESEQUENCEBINDING_H -#define IECOREPYTHON_FILESEQUENCEBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -45,4 +44,3 @@ IECOREPYTHON_API void bindFileSequence(); } -#endif // IECOREPYTHON_FILESEQUENCEBINDING_H diff --git a/include/IECorePython/FileSequenceFunctionsBinding.h b/include/IECorePython/FileSequenceFunctionsBinding.h index a48826fd8e..e19cb2b3fe 100644 --- a/include/IECorePython/FileSequenceFunctionsBinding.h +++ b/include/IECorePython/FileSequenceFunctionsBinding.h @@ -33,8 +33,7 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FILESEQUENCEFUNCTIONSBINDING_H -#define IECOREPYTHON_FILESEQUENCEFUNCTIONSBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -45,4 +44,3 @@ IECOREPYTHON_API void bindFileSequenceFunctions(); } -#endif // IECOREPYTHON_FILESEQUENCEFUNCTIONSBINDING_H diff --git a/include/IECorePython/FileSequenceParameterBinding.h b/include/IECorePython/FileSequenceParameterBinding.h index 607cc79807..cc1731e9e9 100644 --- a/include/IECorePython/FileSequenceParameterBinding.h +++ b/include/IECorePython/FileSequenceParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FILESEQUENCEPARAMETERBINDING_H -#define IECOREPYTHON_FILESEQUENCEPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindFileSequenceParameter(); } -#endif // IECOREPYTHON_FILESEQUENCEPARAMETERBINDING_H diff --git a/include/IECorePython/FileSequenceVectorParameterBinding.h b/include/IECorePython/FileSequenceVectorParameterBinding.h index 233aa9db1e..d7172e656c 100644 --- a/include/IECorePython/FileSequenceVectorParameterBinding.h +++ b/include/IECorePython/FileSequenceVectorParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FILESEQUENCEVECTORPARAMETERBINDING_H -#define IECOREPYTHON_FILESEQUENCEVECTORPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindFileSequenceVectorParameter(); } -#endif // IECOREPYTHON_FILESEQUENCEVECTORPARAMETERBINDING_H diff --git a/include/IECorePython/FrameListBinding.h b/include/IECorePython/FrameListBinding.h index 639eaf51db..c9cccc9650 100644 --- a/include/IECorePython/FrameListBinding.h +++ b/include/IECorePython/FrameListBinding.h @@ -33,8 +33,7 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FRAMELISTBINDING_H -#define IECOREPYTHON_FRAMELISTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -45,4 +44,3 @@ IECOREPYTHON_API void bindFrameList(); } -#endif // IECOREPYTHON_FRAMELISTBINDING_H diff --git a/include/IECorePython/FrameListParameterBinding.h b/include/IECorePython/FrameListParameterBinding.h index b6032aff3f..958293d16e 100644 --- a/include/IECorePython/FrameListParameterBinding.h +++ b/include/IECorePython/FrameListParameterBinding.h @@ -33,8 +33,7 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FRAMELISTPARAMETERBINDING_H -#define IECOREPYTHON_FRAMELISTPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -45,4 +44,3 @@ IECOREPYTHON_API void bindFrameListParameter(); } -#endif // IECOREPYTHON_FRAMELISTPARAMETERBINDING_H diff --git a/include/IECorePython/FrameRangeBinding.h b/include/IECorePython/FrameRangeBinding.h index a66dda4334..d660fcc4ba 100644 --- a/include/IECorePython/FrameRangeBinding.h +++ b/include/IECorePython/FrameRangeBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FRAMERANGEBINDING_H -#define IECOREPYTHON_FRAMERANGEBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindFrameRange(); } -#endif // IECOREPYTHON_FRAMERANGEBINDING_H diff --git a/include/IECorePython/FromCoreConverterBinding.h b/include/IECorePython/FromCoreConverterBinding.h index db2530a58d..4a024b52c1 100644 --- a/include/IECorePython/FromCoreConverterBinding.h +++ b/include/IECorePython/FromCoreConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_FROMCORECONVERTERBINDING_H -#define IECOREPYTHON_FROMCORECONVERTERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindFromCoreConverter(); } -#endif // IECOREPYTHON_FROMCORECONVERTERBINDING_H diff --git a/include/IECorePython/GeometricTypedDataBinding.h b/include/IECorePython/GeometricTypedDataBinding.h index deab68e823..9f15720a30 100644 --- a/include/IECorePython/GeometricTypedDataBinding.h +++ b/include/IECorePython/GeometricTypedDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_GEOMETRICTYPEDDATABINDING_H -#define IECOREPYTHON_GEOMETRICTYPEDDATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API extern void bindGeometricTypedData(); #include "GeometricTypedDataBinding.inl" -#endif // IECOREPYTHON_GEOMETRICTYPEDDATABINDING_H diff --git a/include/IECorePython/GeometricTypedDataBinding.inl b/include/IECorePython/GeometricTypedDataBinding.inl index f1fa448800..5887157efc 100644 --- a/include/IECorePython/GeometricTypedDataBinding.inl +++ b/include/IECorePython/GeometricTypedDataBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_GEOMETRICTYPEDDATABINDING_INL -#define IECOREPYTHON_GEOMETRICTYPEDDATABINDING_INL +#pragma once #include "IECorePython/IECoreBinding.h" #include "IECorePython/RunTimeTypedBinding.h" @@ -266,5 +265,3 @@ class GeometricVectorTypedDataFunctions : ThisBinder } \ } // namespace IECorePython; - -#endif // IECOREPYTHON_GEOMETRICTYPEDDATABINDING_INL diff --git a/include/IECorePython/HalfBinding.h b/include/IECorePython/HalfBinding.h index 6caaa0bde9..e552af330c 100644 --- a/include/IECorePython/HalfBinding.h +++ b/include/IECorePython/HalfBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_HALFBINDING_H -#define IECOREPYTHON_HALFBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindHalf(); } -#endif // IECOREPYTHON_HALFBINDING_H diff --git a/include/IECorePython/HeaderGeneratorBinding.h b/include/IECorePython/HeaderGeneratorBinding.h index aa69bf5ef9..b393fdd5a2 100644 --- a/include/IECorePython/HeaderGeneratorBinding.h +++ b/include/IECorePython/HeaderGeneratorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_HEADERGENERATORBINGING_H -#define IECOREPYTHON_HEADERGENERATORBINGING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindHeaderGenerator(); } -#endif // IECOREPYTHON_HEADERGENERATORBINGING_H diff --git a/include/IECorePython/HexConversionBinding.h b/include/IECorePython/HexConversionBinding.h index 63718165c5..ae1e4eccd6 100644 --- a/include/IECorePython/HexConversionBinding.h +++ b/include/IECorePython/HexConversionBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_HEXCONVERSIONBINDING_H -#define IECOREPYTHON_HEXCONVERSIONBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindHexConversion(); } -#endif // IECOREPYTHON_HEXCONVERSIONBINDING_H diff --git a/include/IECorePython/IECoreBinding.h b/include/IECorePython/IECoreBinding.h index eb3a4265f0..d2cb85e02b 100644 --- a/include/IECorePython/IECoreBinding.h +++ b/include/IECorePython/IECoreBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_IECOREBINDING_H -#define IECOREPYTHON_IECOREBINDING_H +#pragma once #include "boost/python.hpp" @@ -93,4 +92,3 @@ IECOREPYTHON_API inline Py_ssize_t len( const boost::python::object &obj ) } -#endif // IECOREPYTHON_IECOREBINDING_H diff --git a/include/IECorePython/ImathBoxVectorBinding.h b/include/IECorePython/ImathBoxVectorBinding.h index a68b6f0686..d6d33ed075 100644 --- a/include/IECorePython/ImathBoxVectorBinding.h +++ b/include/IECorePython/ImathBoxVectorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_IMATHBOXVECTORBINDING_H -#define IECOREPYTHON_IMATHBOXVECTORBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,5 +41,4 @@ namespace IECorePython IECOREPYTHON_API extern void bindImathBoxVectorTypedData(); } -#endif // IECOREPYTHON_IMATHBOXVECTORBINDING_H diff --git a/include/IECorePython/ImathColorVectorBinding.h b/include/IECorePython/ImathColorVectorBinding.h index 05246ca515..c0ecfb8d6b 100644 --- a/include/IECorePython/ImathColorVectorBinding.h +++ b/include/IECorePython/ImathColorVectorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_IMATHCOLORVECTORBINDING_H -#define IECOREPYTHON_IMATHCOLORVECTORBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,5 +41,4 @@ namespace IECorePython IECOREPYTHON_API extern void bindImathColorVectorTypedData(); } -#endif // IECOREPYTHON_IMATHCOLORVECTORBINDING_H diff --git a/include/IECorePython/ImathMatrixVectorBinding.h b/include/IECorePython/ImathMatrixVectorBinding.h index a60d2a3a97..6a88fce590 100644 --- a/include/IECorePython/ImathMatrixVectorBinding.h +++ b/include/IECorePython/ImathMatrixVectorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_IMATHMATRIXVECTORBINDING_H -#define IECOREPYTHON_IMATHMATRIXVECTORBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,5 +41,4 @@ namespace IECorePython IECOREPYTHON_API extern void bindImathMatrixVectorTypedData(); } -#endif // IECOREPYTHON_IMATHMATRIXVECTORBINDING_H diff --git a/include/IECorePython/ImathQuatVectorBinding.h b/include/IECorePython/ImathQuatVectorBinding.h index 2f4f812734..ee33517917 100644 --- a/include/IECorePython/ImathQuatVectorBinding.h +++ b/include/IECorePython/ImathQuatVectorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_IMATHQUATVECTORBINDING_H -#define IECOREPYTHON_IMATHQUATVECTORBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,5 +41,4 @@ namespace IECorePython IECOREPYTHON_API extern void bindImathQuatVectorTypedData(); } -#endif // IECOREPYTHON_IMATHQUATVECTORBINDING_H diff --git a/include/IECorePython/ImathVecVectorBinding.h b/include/IECorePython/ImathVecVectorBinding.h index 998babf29b..9fb45bba20 100644 --- a/include/IECorePython/ImathVecVectorBinding.h +++ b/include/IECorePython/ImathVecVectorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_IMATHVECVECTORBINDING_H -#define IECOREPYTHON_IMATHVECVECTORBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,5 +41,4 @@ namespace IECorePython IECOREPYTHON_API extern void bindImathVecVectorTypedData(); } -#endif // IECOREPYTHON_IMATHVECVECTORBINDING_H diff --git a/include/IECorePython/ImfBinding.h b/include/IECorePython/ImfBinding.h index 914022299b..4a30cd6210 100644 --- a/include/IECorePython/ImfBinding.h +++ b/include/IECorePython/ImfBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_IMFBINDING_H -#define IECOREPYTHON_IMFBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindImf(); } -#endif // IECOREPYTHON_IMFBINDING_H diff --git a/include/IECorePython/ImfTimeCodeBinding.h b/include/IECorePython/ImfTimeCodeBinding.h index f287fce4d8..1f9f9db191 100644 --- a/include/IECorePython/ImfTimeCodeBinding.h +++ b/include/IECorePython/ImfTimeCodeBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_IMFTIMECODEBINDING_H -#define IECOREPYTHON_IMFTIMECODEBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindImfTimeCode(); } -#endif // IECOREPYTHON_IMFTIMECODEBINDING_H diff --git a/include/IECorePython/IndexedIOAlgoBinding.h b/include/IECorePython/IndexedIOAlgoBinding.h index 1c7e6a52ff..7e10ac3f1d 100644 --- a/include/IECorePython/IndexedIOAlgoBinding.h +++ b/include/IECorePython/IndexedIOAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_INDEXEDIOALGOBINDING_H -#define IECOREPYTHON_INDEXEDIOALGOBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindIndexedIOAlgo(); } -#endif // IECOREPYTHON_INDEXEDIOALGOBINDING_H diff --git a/include/IECorePython/IndexedIOBinding.h b/include/IECorePython/IndexedIOBinding.h index 1e4a11cd8c..69cee156d5 100644 --- a/include/IECorePython/IndexedIOBinding.h +++ b/include/IECorePython/IndexedIOBinding.h @@ -32,11 +32,9 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_INDEXEDIOBINDING_H -#define IECOREPYTHON_INDEXEDIOBINDING_H +#pragma once #include "IECorePython/Export.h" extern IECOREPYTHON_API void bindIndexedIO(); -#endif // IECOREPYTHON_INDEXEDIOBINDING_H diff --git a/include/IECorePython/InternedStringBinding.h b/include/IECorePython/InternedStringBinding.h index 5102273940..98a168b6c0 100644 --- a/include/IECorePython/InternedStringBinding.h +++ b/include/IECorePython/InternedStringBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_INTERNEDSTRINGBINDING_H -#define IECOREPYTHON_INTERNEDSTRINGBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindInternedString(); } -#endif // IECOREPYTHON_INTERNEDSTRINGBINDING_H diff --git a/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h b/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h index 92063404da..761ee944dc 100644 --- a/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h +++ b/include/IECorePython/InverseDistanceWeightedInterpolationBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_INVERSEDISTANCEWEIGHTEDINTERPOLATIONBINDING_H -#define IECOREPYTHON_INVERSEDISTANCEWEIGHTEDINTERPOLATIONBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindInverseDistanceWeightedInterpolation(); } -#endif // IECOREPYTHON_INVERSEDISTANCEWEIGHTEDINTERPOLATIONBINDING_H diff --git a/include/IECorePython/KDTreeBinding.h b/include/IECorePython/KDTreeBinding.h index 5ffd514da0..fe9545bc52 100644 --- a/include/IECorePython/KDTreeBinding.h +++ b/include/IECorePython/KDTreeBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_KDTREEBINDING_H -#define IECOREPYTHON_KDTREEBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindKDTree(); } -#endif // IECOREPYTHON_KDTREEBINDING_H diff --git a/include/IECorePython/LRUCacheBinding.h b/include/IECorePython/LRUCacheBinding.h index 74e2b3f1a7..3ff6dd0d91 100644 --- a/include/IECorePython/LRUCacheBinding.h +++ b/include/IECorePython/LRUCacheBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_LRUCACHEBINDING_H -#define IECOREPYTHON_LRUCACHEBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindLRUCache(); } -#endif // IECOREPYTHON_LRUCACHEBINDING_H diff --git a/include/IECorePython/LensModelBinding.h b/include/IECorePython/LensModelBinding.h index 0d62449819..8f1f7a8206 100644 --- a/include/IECorePython/LensModelBinding.h +++ b/include/IECorePython/LensModelBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_LENSMODEL_BINDING -#define IECOREPYTHON_LENSMODEL_BINDING +#pragma once #include "IECorePython/Export.h" @@ -42,5 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindLensModel(); } -#endif // IECOREPYTHON_LENSMODEL_BINDING - diff --git a/include/IECorePython/LevenbergMarquardtBinding.h b/include/IECorePython/LevenbergMarquardtBinding.h index 697cb17dbd..3b1c769962 100644 --- a/include/IECorePython/LevenbergMarquardtBinding.h +++ b/include/IECorePython/LevenbergMarquardtBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_LEVENBERGMARQUARDTBINDING_H -#define IECOREPYTHON_LEVENBERGMARQUARDTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindLevenbergMarquardt(); } -#endif // IECOREPYTHON_LEVENBERGMARQUARDTBINDING_H diff --git a/include/IECorePython/LineSegmentBinding.h b/include/IECorePython/LineSegmentBinding.h index 1c0a5b3594..be6dc63a11 100644 --- a/include/IECorePython/LineSegmentBinding.h +++ b/include/IECorePython/LineSegmentBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_LINESEGMENTBINDING_H -#define IECOREPYTHON_LINESEGMENTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindLineSegment(); } -#endif // IECOREPYTHON_LINESEGMENTBINDING_H diff --git a/include/IECorePython/LineTypedParameterBinding.h b/include/IECorePython/LineTypedParameterBinding.h index 7c5754a6a9..97d1ffbdb2 100644 --- a/include/IECorePython/LineTypedParameterBinding.h +++ b/include/IECorePython/LineTypedParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_LINETYPEDPARAMETERBINDING_H -#define IECOREPYTHON_LINETYPEDPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindLineTypedParameter(); } -#endif // IECOREPYTHON_LINETYPEDPARAMETERBINDING_H diff --git a/include/IECorePython/LookupBinding.h b/include/IECorePython/LookupBinding.h index 504f314786..5e5685a124 100644 --- a/include/IECorePython/LookupBinding.h +++ b/include/IECorePython/LookupBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_LOOKUPBINDING_H -#define IECOREPYTHON_LOOKUPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindLookup(); } // namespace IECorePython -#endif // IECOREPYTHON_LOOKUPBINDING_H diff --git a/include/IECorePython/MathBinding.h b/include/IECorePython/MathBinding.h index e48435bb0a..a2bccddbaf 100644 --- a/include/IECorePython/MathBinding.h +++ b/include/IECorePython/MathBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_MATHBINDING_H -#define IECOREPYTHON_MATHBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindMath(); } -#endif // IECOREPYTHON_MATHBINDING_H diff --git a/include/IECorePython/MatrixMultiplyOpBinding.h b/include/IECorePython/MatrixMultiplyOpBinding.h index d7f598c0de..9a3826bb37 100644 --- a/include/IECorePython/MatrixMultiplyOpBinding.h +++ b/include/IECorePython/MatrixMultiplyOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_MATRIXMULTIPLYOPBINDING_H -#define IECOREPYTHON_MATRIXMULTIPLYOPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindMatrixMultiplyOp(); } -#endif // IECOREPYTHON_MATRIXMULTIPLYOPBINDING_H diff --git a/include/IECorePython/MatrixTypedParameterBinding.h b/include/IECorePython/MatrixTypedParameterBinding.h index 5ccdd0e466..8bab0a3d99 100644 --- a/include/IECorePython/MatrixTypedParameterBinding.h +++ b/include/IECorePython/MatrixTypedParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_MATRIXTYPEDPARAMETERBINDING_H -#define IECOREPYTHON_MATRIXTYPEDPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindMatrixTypedParameter(); } -#endif // IECOREPYTHON_MATRIXTYPEDPARAMETERBINDING_H diff --git a/include/IECorePython/MessageHandlerBinding.h b/include/IECorePython/MessageHandlerBinding.h index cb49497bdb..2922aec96e 100644 --- a/include/IECorePython/MessageHandlerBinding.h +++ b/include/IECorePython/MessageHandlerBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_MESSAGEHANDLERBINDING_H -#define IECOREPYTHON_MESSAGEHANDLERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindMessageHandler(); } -#endif // IECOREPYTHON_MESSAGEHANDLERBINDING_H diff --git a/include/IECorePython/ModifyOpBinding.h b/include/IECorePython/ModifyOpBinding.h index 925eac3b9b..ef674f143f 100644 --- a/include/IECorePython/ModifyOpBinding.h +++ b/include/IECorePython/ModifyOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_MODIFYOPBINDING_H -#define IECOREPYTHON_MODIFYOPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindModifyOp(); } -#endif // IECOREPYTHON_MODIFYOPBINDING_H diff --git a/include/IECorePython/MurmurHashBinding.h b/include/IECorePython/MurmurHashBinding.h index 722823c226..84163f9444 100644 --- a/include/IECorePython/MurmurHashBinding.h +++ b/include/IECorePython/MurmurHashBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_MURMURHASHBINDING_H -#define IECOREPYTHON_MURMURHASHBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindMurmurHash(); } -#endif // IECOREPYTHON_MURMURHASHBINDING_H diff --git a/include/IECorePython/NullObjectBinding.h b/include/IECorePython/NullObjectBinding.h index a7968d5ba7..d42a39cae0 100644 --- a/include/IECorePython/NullObjectBinding.h +++ b/include/IECorePython/NullObjectBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_NULLOBJECTBINDING_H -#define IECOREPYTHON_NULLOBJECTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindNullObject(); } -#endif // IECOREPYTHON_NULLOBJECTBINDING_H diff --git a/include/IECorePython/NumericParameterBinding.h b/include/IECorePython/NumericParameterBinding.h index 7363757690..1ea38de9f7 100644 --- a/include/IECorePython/NumericParameterBinding.h +++ b/include/IECorePython/NumericParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_NUMERICPARAMETERBINDING_H -#define IECOREPYTHON_NUMERICPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindNumericParameter(); } -#endif // IECOREPYTHON_NUMERICPARAMETERBINDING_H diff --git a/include/IECorePython/ObjectBinding.h b/include/IECorePython/ObjectBinding.h index 1d39e0e14f..e175fb3761 100644 --- a/include/IECorePython/ObjectBinding.h +++ b/include/IECorePython/ObjectBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OBJECTBINDING_H -#define IECOREPYTHON_OBJECTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindObject(); } -#endif // IECOREPYTHON_OBJECTBINDING_H diff --git a/include/IECorePython/ObjectInterpolatorBinding.h b/include/IECorePython/ObjectInterpolatorBinding.h index 7057983f58..b07a51ccf9 100644 --- a/include/IECorePython/ObjectInterpolatorBinding.h +++ b/include/IECorePython/ObjectInterpolatorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OBJECTINTERPOLATORBINDING_H -#define IECOREPYTHON_OBJECTINTERPOLATORBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindObjectInterpolator(); } -#endif // IECOREPYTHON_OBJECTINTERPOLATORBINDING_H diff --git a/include/IECorePython/ObjectMatrixBinding.h b/include/IECorePython/ObjectMatrixBinding.h index 0fad79ab1d..63633ee7bd 100644 --- a/include/IECorePython/ObjectMatrixBinding.h +++ b/include/IECorePython/ObjectMatrixBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OBJECTMATRIXBINDING_H -#define IECOREPYTHON_OBJECTMATRIXBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindObjectMatrix(); } -#endif // IECOREPYTHON_OBJECTMATRIXBINDING_H diff --git a/include/IECorePython/ObjectParameterBinding.h b/include/IECorePython/ObjectParameterBinding.h index 5436cba851..23aa8d0c6a 100644 --- a/include/IECorePython/ObjectParameterBinding.h +++ b/include/IECorePython/ObjectParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OBJECTPARAMETERBINDING_H -#define IECOREPYTHON_OBJECTPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindObjectParameter(); } -#endif // IECOREPYTHON_OBJECTPARAMETERBINDING_H diff --git a/include/IECorePython/ObjectPoolBinding.h b/include/IECorePython/ObjectPoolBinding.h index 252901f893..b65eb18f21 100644 --- a/include/IECorePython/ObjectPoolBinding.h +++ b/include/IECorePython/ObjectPoolBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OBJECTPOOL_H -#define IECOREPYTHON_OBJECTPOOL_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindObjectPool(); } -#endif // IECOREPYTHON_OBJECTPOOL_H diff --git a/include/IECorePython/ObjectReaderBinding.h b/include/IECorePython/ObjectReaderBinding.h index 5b2b51fa10..ef98b97d3e 100644 --- a/include/IECorePython/ObjectReaderBinding.h +++ b/include/IECorePython/ObjectReaderBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OBJECTREADERBINDING_H -#define IECOREPYTHON_OBJECTREADERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindObjectReader(); } -#endif // IECOREPYTHON_OBJECTREADERBINDING_H diff --git a/include/IECorePython/ObjectVectorBinding.h b/include/IECorePython/ObjectVectorBinding.h index 5051bba1cb..3fcd015323 100644 --- a/include/IECorePython/ObjectVectorBinding.h +++ b/include/IECorePython/ObjectVectorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OBJECTVECTOR_H -#define IECOREPYTHON_OBJECTVECTOR_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindObjectVector(); } -#endif // IECOREPYTHON_OBJECTVECTOR_H diff --git a/include/IECorePython/ObjectWriterBinding.h b/include/IECorePython/ObjectWriterBinding.h index 0d250278e5..d6e6dd6921 100644 --- a/include/IECorePython/ObjectWriterBinding.h +++ b/include/IECorePython/ObjectWriterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OBJECTWRITERBINDING_H -#define IECOREPYTHON_OBJECTWRITERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindObjectWriter(); } -#endif // IECOREPYTHON_OBJECTWRITERBINDING_H diff --git a/include/IECorePython/OpBinding.h b/include/IECorePython/OpBinding.h index e8f15e2009..29e66055ef 100644 --- a/include/IECorePython/OpBinding.h +++ b/include/IECorePython/OpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OPBINDING_H -#define IECOREPYTHON_OPBINDING_H +#pragma once #include "IECorePython/Export.h" #include "IECorePython/RunTimeTypedBinding.h" @@ -103,4 +102,3 @@ IECOREPYTHON_API void bindOp(); } -#endif // IECOREPYTHON_OPBINDING_H diff --git a/include/IECorePython/OversamplesCalculatorBinding.h b/include/IECorePython/OversamplesCalculatorBinding.h index b63021960b..d4c6767f1c 100644 --- a/include/IECorePython/OversamplesCalculatorBinding.h +++ b/include/IECorePython/OversamplesCalculatorBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_OVERSAMPLESCALCULATORBINDING_H -#define IECOREPYTHON_OVERSAMPLESCALCULATORBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindOversamplesCalculator(); } // namespace IECorePython -#endif // IECOREPYTHON_OVERSAMPLESCALCULATORBINDING_H diff --git a/include/IECorePython/ParameterBinding.h b/include/IECorePython/ParameterBinding.h index 9f8fe2c7f6..1da7a763d1 100644 --- a/include/IECorePython/ParameterBinding.h +++ b/include/IECorePython/ParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_PARAMETERBINDING_H -#define IECOREPYTHON_PARAMETERBINDING_H +#pragma once #include "boost/python.hpp" @@ -124,4 +123,3 @@ IECOREPYTHON_API void bindParameter(); #include "IECorePython/ParameterBinding.inl" -#endif // IECOREPYTHON_PARAMETERBINDING_H diff --git a/include/IECorePython/ParameterBinding.inl b/include/IECorePython/ParameterBinding.inl index 4114fa6840..c336d2f4bf 100644 --- a/include/IECorePython/ParameterBinding.inl +++ b/include/IECorePython/ParameterBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_PARAMETERBINDING_INL -#define IECOREPYTHON_PARAMETERBINDING_INL +#pragma once #include "IECorePython/IECoreBinding.h" @@ -84,5 +83,3 @@ ParameterClass::ParameterClass( const char *docString ) } } // namespace IECorePython - -#endif // IECOREPYTHON_PARAMETERBINDING_INL diff --git a/include/IECorePython/ParameterisedBinding.h b/include/IECorePython/ParameterisedBinding.h index 504d19374f..ca7040a901 100644 --- a/include/IECorePython/ParameterisedBinding.h +++ b/include/IECorePython/ParameterisedBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_PARAMETERISEDBINDING_H -#define IECOREPYTHON_PARAMETERISEDBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindParameterised(); } -#endif // IECOREPYTHON_PARAMETERISEDBINDING_H diff --git a/include/IECorePython/PathMatcherBinding.h b/include/IECorePython/PathMatcherBinding.h index be9c960d15..efe27267a0 100644 --- a/include/IECorePython/PathMatcherBinding.h +++ b/include/IECorePython/PathMatcherBinding.h @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_PATHMATCHERBINDING_H -#define IECOREPYTHON_PATHMATCHERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -46,4 +45,3 @@ IECOREPYTHON_API void bindPathMatcher(); } // namespace IECorePython -#endif // IECOREPYTHON_PATHMATCHERBINDING_H diff --git a/include/IECorePython/PathParameterBinding.h b/include/IECorePython/PathParameterBinding.h index 4ecd9bf60e..c008ccc33c 100644 --- a/include/IECorePython/PathParameterBinding.h +++ b/include/IECorePython/PathParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_PATHPARAMETERBINDING_H -#define IECOREPYTHON_PATHPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindPathParameter(); } -#endif // IECOREPYTHON_PATHPARAMETERBINDING_H diff --git a/include/IECorePython/PathVectorParameterBinding.h b/include/IECorePython/PathVectorParameterBinding.h index b71c504ae6..815118712b 100644 --- a/include/IECorePython/PathVectorParameterBinding.h +++ b/include/IECorePython/PathVectorParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_PATHVECTORPARAMETERBINDING_H -#define IECOREPYTHON_PATHVECTORPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindPathVectorParameter(); } -#endif // IECOREPYTHON_PATHVECTORPARAMETERBINDING_H diff --git a/include/IECorePython/PointDistributionBinding.h b/include/IECorePython/PointDistributionBinding.h index 31e4f3cfdf..ed9efacb4f 100644 --- a/include/IECorePython/PointDistributionBinding.h +++ b/include/IECorePython/PointDistributionBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_POINTDISTRIBUTIONBINDING_H -#define IECOREPYTHON_POINTDISTRIBUTIONBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindPointDistribution(); } -#endif // IECOREPYTHON_POINTDISTRIBUTIONBINDING_H diff --git a/include/IECorePython/PointerFromSWIG.h b/include/IECorePython/PointerFromSWIG.h index 3790794955..20aeada449 100644 --- a/include/IECorePython/PointerFromSWIG.h +++ b/include/IECorePython/PointerFromSWIG.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_POINTERFROMSWIG_H -#define IECOREPYTHON_POINTERFROMSWIG_H +#pragma once #include "boost/python.hpp" @@ -64,4 +63,3 @@ class IECOREPYTHON_API PointerFromSWIG #include "IECorePython/PointerFromSWIG.inl" -#endif // IECOREPYTHON_POINTERFROMSWIG_H diff --git a/include/IECorePython/PointerFromSWIG.inl b/include/IECorePython/PointerFromSWIG.inl index ff5ab93b26..81588aece4 100644 --- a/include/IECorePython/PointerFromSWIG.inl +++ b/include/IECorePython/PointerFromSWIG.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_POINTERFROMSWIG_INL -#define IECOREPYTHON_POINTERFROMSWIG_INL +#pragma once #include "boost/python.hpp" @@ -74,5 +73,3 @@ PointerFromSWIG::PointerFromSWIG() } } // namespace IECorePython - -#endif // IECOREPYTHON_POINTERFROMSWIG_INL diff --git a/include/IECorePython/PolygonAlgoBinding.h b/include/IECorePython/PolygonAlgoBinding.h index f7b07d5f50..bbc2bf5457 100644 --- a/include/IECorePython/PolygonAlgoBinding.h +++ b/include/IECorePython/PolygonAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_POLYGONALGOBINDING_H -#define IECOREPYTHON_POLYGONALGOBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindPolygonAlgo(); } -#endif // IECOREPYTHON_POLYGONALGOBINDING_H diff --git a/include/IECorePython/PyBindConverter.h b/include/IECorePython/PyBindConverter.h index b3434a9838..b9dd89139f 100644 --- a/include/IECorePython/PyBindConverter.h +++ b/include/IECorePython/PyBindConverter.h @@ -35,8 +35,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_PYBINDCONVERTER_H -#define IECOREPYTHON_PYBINDCONVERTER_H +#pragma once #include "boost/python.hpp" @@ -98,5 +97,4 @@ struct PyBindConverter } // namespace IECorePython -#endif // IECOREPYTHON_PYBINDCONVERTER_H diff --git a/include/IECorePython/RampBinding.h b/include/IECorePython/RampBinding.h index e1beb90fba..1c6e6e1561 100644 --- a/include/IECorePython/RampBinding.h +++ b/include/IECorePython/RampBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_RAMPBINDING_H -#define IECOREPYTHON_RAMPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindRamp(); } -#endif // IECOREPYTHON_RAMPBINDING_H diff --git a/include/IECorePython/RampDataBinding.h b/include/IECorePython/RampDataBinding.h index 75173a8f02..594bec1492 100644 --- a/include/IECorePython/RampDataBinding.h +++ b/include/IECorePython/RampDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_RAMPDATABINDING_H -#define IECOREPYTHON_RAMPDATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindRampData(); } -#endif // IECOREPYTHON_RAMPDATABINDING_H diff --git a/include/IECorePython/RandomAlgoBinding.h b/include/IECorePython/RandomAlgoBinding.h index 1e2ef65691..a32f8d1cb1 100644 --- a/include/IECorePython/RandomAlgoBinding.h +++ b/include/IECorePython/RandomAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_RANDOMALGOBINDING_H -#define IECOREPYTHON_RANDOMALGOBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindRandomAlgo(); } // namespace IECorePython -#endif // IECOREPYTHON_RANDOMALGOBINDING_H diff --git a/include/IECorePython/RandomRotationOpBinding.h b/include/IECorePython/RandomRotationOpBinding.h index 48a412ec8d..548fed426a 100644 --- a/include/IECorePython/RandomRotationOpBinding.h +++ b/include/IECorePython/RandomRotationOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_RANDOMROTATIONOPBINDING_H -#define IECOREPYTHON_RANDOMROTATIONOPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindRandomRotationOp(); } -#endif // IECOREPYTHON_RANDOMROTATIONOPBINDING_H diff --git a/include/IECorePython/ReaderBinding.h b/include/IECorePython/ReaderBinding.h index 9241502225..88149a2dea 100644 --- a/include/IECorePython/ReaderBinding.h +++ b/include/IECorePython/ReaderBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_READERBINDING_H -#define IECOREPYTHON_READERBINDING_H +#pragma once #include "IECorePython/ExceptionAlgo.h" #include "IECorePython/Export.h" @@ -103,4 +102,3 @@ IECOREPYTHON_API void bindReader(); #include "IECorePython/ReaderBinding.inl" -#endif // IECOREPYTHON_READERBINDING_H diff --git a/include/IECorePython/ReaderBinding.inl b/include/IECorePython/ReaderBinding.inl index 461d6ffa81..4ff4bfd1e6 100644 --- a/include/IECorePython/ReaderBinding.inl +++ b/include/IECorePython/ReaderBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_READERBINDING_INL -#define IECOREPYTHON_READERBINDING_INL +#pragma once #include "IECorePython/IECoreBinding.h" @@ -68,5 +67,3 @@ ReaderClass::ReaderClass( const char *docString ) } } // namespace IECorePython - -#endif // IECOREPYTHON_READERBINDING_INL diff --git a/include/IECorePython/RefCountedBinding.h b/include/IECorePython/RefCountedBinding.h index 8674901533..9210de8d1d 100644 --- a/include/IECorePython/RefCountedBinding.h +++ b/include/IECorePython/RefCountedBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_REFCOUNTEDBINDING_H -#define IECOREPYTHON_REFCOUNTEDBINDING_H +#pragma once #include "IECorePython/Export.h" #include "IECorePython/WrapperGarbageCollector.h" @@ -117,4 +116,3 @@ struct CastToIntrusivePtr #include "IECorePython/RefCountedBinding.inl" -#endif // IECOREPYTHON_REFCOUNTEDBINDING_H diff --git a/include/IECorePython/RefCountedBinding.inl b/include/IECorePython/RefCountedBinding.inl index c9657847f9..df54bd938d 100644 --- a/include/IECorePython/RefCountedBinding.inl +++ b/include/IECorePython/RefCountedBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREBINDINGS_REFCOUNTEDBINDING_INL -#define IECOREBINDINGS_REFCOUNTEDBINDING_INL +#pragma once #include "IECorePython/ScopedGILRelease.h" #include "IECorePython/WrapperGarbageCollector.h" @@ -225,5 +224,3 @@ RefCountedClass::RefCountedClass( const char *className, cons } } // namespace IECorePython - -#endif // IECOREBINDINGS_REFCOUNTEDBINDING_INL diff --git a/include/IECorePython/ReorderedFrameListBinding.h b/include/IECorePython/ReorderedFrameListBinding.h index dec8621cff..8c3156336b 100644 --- a/include/IECorePython/ReorderedFrameListBinding.h +++ b/include/IECorePython/ReorderedFrameListBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_REORDEREDFRAMELISTBINDING_H -#define IECOREPYTHON_REORDEREDFRAMELISTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindReorderedFrameList(); } -#endif // IECOREPYTHON_REORDEREDFRAMELISTBINDING_H diff --git a/include/IECorePython/ReversedFrameListBinding.h b/include/IECorePython/ReversedFrameListBinding.h index 9dc62fbf8b..4343a69357 100644 --- a/include/IECorePython/ReversedFrameListBinding.h +++ b/include/IECorePython/ReversedFrameListBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_REVERSEDFRAMELISTBINDING_H -#define IECOREPYTHON_REVERSEDFRAMELISTBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindReversedFrameList(); } -#endif // IECOREPYTHON_REVERSEDFRAMELISTBINDING_H diff --git a/include/IECorePython/RunTimeTypedBinding.h b/include/IECorePython/RunTimeTypedBinding.h index 1d8c9f9f7c..4de51b8fcc 100644 --- a/include/IECorePython/RunTimeTypedBinding.h +++ b/include/IECorePython/RunTimeTypedBinding.h @@ -33,8 +33,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_RUNTIMETYPEDBINDING_H -#define IECOREPYTHON_RUNTIMETYPEDBINDING_H +#pragma once #include "IECorePython/Export.h" #include "IECorePython/RefCountedBinding.h" @@ -86,4 +85,3 @@ class RunTimeTypedClass : public RefCountedClass::isInstanceOf( const char *typeName ) const return boost::python::extract( res ); } } - + catch( const boost::python::error_already_set & ) { ExceptionAlgo::translatePythonException(); @@ -228,5 +227,3 @@ RunTimeTypedClass::RunTimeTypedClass( const char *docString ) } } // namespace IECorePython - -#endif // IECOREPYTHON_RUNTIMETYPEDBINDING_INL diff --git a/include/IECorePython/ScopedGILLock.h b/include/IECorePython/ScopedGILLock.h index 60a870cf60..d8aec34f4e 100644 --- a/include/IECorePython/ScopedGILLock.h +++ b/include/IECorePython/ScopedGILLock.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_SCOPEDGILLOCK_H -#define IECOREPYTHON_SCOPEDGILLOCK_H +#pragma once #include "boost/python.hpp" @@ -64,4 +63,3 @@ class IECOREPYTHON_API ScopedGILLock : boost::noncopyable } // namespace IECorePython -#endif // IECOREPYTHON_SCOPEDGILLOCK_H diff --git a/include/IECorePython/ScopedGILRelease.h b/include/IECorePython/ScopedGILRelease.h index afe5eaddce..2c0ccdbba0 100644 --- a/include/IECorePython/ScopedGILRelease.h +++ b/include/IECorePython/ScopedGILRelease.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_SCOPEDGILRELEASE_H -#define IECOREPYTHON_SCOPEDGILRELEASE_H +#pragma once #include "boost/python.hpp" @@ -64,4 +63,3 @@ class IECOREPYTHON_API ScopedGILRelease : boost::noncopyable } // namespace IECorePython -#endif // IECOREPYTHON_SCOPEDGILRELEASE_H diff --git a/include/IECorePython/SearchPathBinding.h b/include/IECorePython/SearchPathBinding.h index ef93593c15..dd8640504c 100644 --- a/include/IECorePython/SearchPathBinding.h +++ b/include/IECorePython/SearchPathBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_SEARCHPATHBINDING_H -#define IECOREPYTHON_SEARCHPATHBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindSearchPath(); } -#endif // IECOREPYTHON_SEARCHPATHBINDING_H diff --git a/include/IECorePython/SimpleTypedDataBinding.h b/include/IECorePython/SimpleTypedDataBinding.h index 6b9ce2e05d..e1aafff76f 100644 --- a/include/IECorePython/SimpleTypedDataBinding.h +++ b/include/IECorePython/SimpleTypedDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_SIMPLETYPEDDATABINDING_H -#define IECOREPYTHON_SIMPLETYPEDDATABINDING_H +#pragma once #include "boost/python.hpp" @@ -60,5 +59,4 @@ IECOREPYTHON_API extern void bindAllSimpleTypedData(); #include "IECorePython/SimpleTypedDataBinding.inl" -#endif // IECOREPYTHON_SIMPLETYPEDDATABINDING_H diff --git a/include/IECorePython/SimpleTypedDataBinding.inl b/include/IECorePython/SimpleTypedDataBinding.inl index 8f16f8d815..26e540daef 100644 --- a/include/IECorePython/SimpleTypedDataBinding.inl +++ b/include/IECorePython/SimpleTypedDataBinding.inl @@ -32,6 +32,8 @@ // ////////////////////////////////////////////////////////////////////////// +#pragma once + #include "IECore/SimpleTypedData.h" namespace IECorePython diff --git a/include/IECorePython/SimpleTypedParameterBinding.h b/include/IECorePython/SimpleTypedParameterBinding.h index 1ca3f2bf75..bdc59a6f45 100644 --- a/include/IECorePython/SimpleTypedParameterBinding.h +++ b/include/IECorePython/SimpleTypedParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_SIMPLETYPEDPARAMETERBINDING_H -#define IECOREPYTHON_SIMPLETYPEDPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindSimpleTypedParameter(); } -#endif // IECOREPYTHON_SIMPLETYPEDPARAMETERBINDING_H diff --git a/include/IECorePython/SplineBinding.h b/include/IECorePython/SplineBinding.h index e9c4d6b5c5..de1e50fd59 100644 --- a/include/IECorePython/SplineBinding.h +++ b/include/IECorePython/SplineBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_SPLINEBINDING_H -#define IECOREPYTHON_SPLINEBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindSpline(); } -#endif // IECOREPYTHON_SPLINEBINDING_H diff --git a/include/IECorePython/SplineDataBinding.h b/include/IECorePython/SplineDataBinding.h index 96cdb29efa..ea084437a5 100644 --- a/include/IECorePython/SplineDataBinding.h +++ b/include/IECorePython/SplineDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_SPLINEDATABINDING_H -#define IECOREPYTHON_SPLINEDATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindSplineData(); } -#endif // IECOREPYTHON_SPLINEDATABINDING_H diff --git a/include/IECorePython/SplineParameterBinding.h b/include/IECorePython/SplineParameterBinding.h index 40dd831dfb..df64ac5832 100644 --- a/include/IECorePython/SplineParameterBinding.h +++ b/include/IECorePython/SplineParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_SPLINEPARAMETERBINDING_H -#define IECOREPYTHON_SPLINEPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindSplineParameter(); } -#endif // IECOREPYTHON_SPLINEPARAMETERBINDING_H diff --git a/include/IECorePython/StandardRadialLensModelBinding.h b/include/IECorePython/StandardRadialLensModelBinding.h index 05f8a17f11..6567565633 100644 --- a/include/IECorePython/StandardRadialLensModelBinding.h +++ b/include/IECorePython/StandardRadialLensModelBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_STANDARDRADIALLENSMODEL_BINDING -#define IECOREPYTHON_STANDARDRADIALLENSMODEL_BINDING +#pragma once #include "IECorePython/Export.h" @@ -42,5 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindStandardRadialLensModel(); } -#endif // IECOREPYTHON_STANDARDRADIALLENSMODEL_BINDING - diff --git a/include/IECorePython/StringAlgoBinding.h b/include/IECorePython/StringAlgoBinding.h index aee583a70a..8ced7cdf39 100644 --- a/include/IECorePython/StringAlgoBinding.h +++ b/include/IECorePython/StringAlgoBinding.h @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_STRINGALGOBINDING_H -#define IECOREPYTHON_STRINGALGOBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -46,4 +45,3 @@ IECOREPYTHON_API void bindStringAlgo(); } // namespace IECorePython -#endif // IECOREPYTHON_STRINGALGOBINDING_H diff --git a/include/IECorePython/TimeCodeDataBinding.h b/include/IECorePython/TimeCodeDataBinding.h index 6ab8b3e887..18f224c043 100644 --- a/include/IECorePython/TimeCodeDataBinding.h +++ b/include/IECorePython/TimeCodeDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TIMECODEDATABINDING_H -#define IECOREPYTHON_TIMECODEDATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindTimeCodeData(); } -#endif // IECOREPYTHON_TIMECODEDATABINDING_H diff --git a/include/IECorePython/TimerBinding.h b/include/IECorePython/TimerBinding.h index 22e4a99f19..7b0f360953 100644 --- a/include/IECorePython/TimerBinding.h +++ b/include/IECorePython/TimerBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TIMERBINDING_H -#define IECOREPYTHON_TIMERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindTimer(); } -#endif // IECOREPYTHON_TIMERBINDING_H diff --git a/include/IECorePython/ToCoreConverterBinding.h b/include/IECorePython/ToCoreConverterBinding.h index 1a6d811e8b..54f9a6c5b6 100644 --- a/include/IECorePython/ToCoreConverterBinding.h +++ b/include/IECorePython/ToCoreConverterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TOCORECONVERTERBINDING_H -#define IECOREPYTHON_TOCORECONVERTERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindToCoreConverter(); } -#endif // IECOREPYTHON_TOCORECONVERTERBINDING_H diff --git a/include/IECorePython/TransformationMatrixBinding.h b/include/IECorePython/TransformationMatrixBinding.h index a532d72e67..a37bedd175 100644 --- a/include/IECorePython/TransformationMatrixBinding.h +++ b/include/IECorePython/TransformationMatrixBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TRANSFORMATIONMATRIXBINDING_H -#define IECOREPYTHON_TRANSFORMATIONMATRIXBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindTransformationMatrix(); } -#endif // IECOREPYTHON_TRANSFORMATIONMATRIXBINDING_H diff --git a/include/IECorePython/TransformationMatrixDataBinding.h b/include/IECorePython/TransformationMatrixDataBinding.h index ab74c60819..e25950b896 100644 --- a/include/IECorePython/TransformationMatrixDataBinding.h +++ b/include/IECorePython/TransformationMatrixDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TRANSFORMATIONMATRIXDATABINDING_H -#define IECOREPYTHON_TRANSFORMATIONMATRIXDATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindTransformationMatrixData(); } -#endif // IECOREPYTHON_TRANSFORMATIONMATRIXDATABINDING_H diff --git a/include/IECorePython/TriangleAlgoBinding.h b/include/IECorePython/TriangleAlgoBinding.h index 585c5b8b80..c194765a61 100644 --- a/include/IECorePython/TriangleAlgoBinding.h +++ b/include/IECorePython/TriangleAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TRIANGLEALGOBINDING_H -#define IECOREPYTHON_TRIANGLEALGOBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindTriangleAlgo(); } -#endif // IECOREPYTHON_TRIANGLEALGOBINDING_H diff --git a/include/IECorePython/TypeIdBinding.h b/include/IECorePython/TypeIdBinding.h index d263b55ed2..ace89ddf8d 100644 --- a/include/IECorePython/TypeIdBinding.h +++ b/include/IECorePython/TypeIdBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TYPEIDBINDING_H -#define IECOREPYTHON_TYPEIDBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindTypeId(); } -#endif // IECOREPYTHON_TYPEIDBINDING_H diff --git a/include/IECorePython/TypedObjectParameterBinding.h b/include/IECorePython/TypedObjectParameterBinding.h index a49e29ce7e..3046b513fb 100644 --- a/include/IECorePython/TypedObjectParameterBinding.h +++ b/include/IECorePython/TypedObjectParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TYPEDOBJECTPARAMETERBINDING_H -#define IECOREPYTHON_TYPEDOBJECTPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -48,4 +47,3 @@ class IECOREPYTHON_API TypedObjectParameterWrap; #include "IECorePython/TypedObjectParameterBinding.inl" -#endif // IECOREPYTHON_TYPEDOBJECTPARAMETERBINDING_H diff --git a/include/IECorePython/TypedObjectParameterBinding.inl b/include/IECorePython/TypedObjectParameterBinding.inl index c23faf2a93..a0a4c2bd4b 100644 --- a/include/IECorePython/TypedObjectParameterBinding.inl +++ b/include/IECorePython/TypedObjectParameterBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TYPEDOBJECTPARAMETERBINDING_INL -#define IECOREPYTHON_TYPEDOBJECTPARAMETERBINDING_INL +#pragma once #include "IECorePython/ParameterBinding.h" @@ -57,5 +56,3 @@ class TypedObjectParameterWrapper : public ParameterWrapper< IECore::TypedObject }; } - -#endif // IECOREPYTHON_TYPEDOBJECTPARAMETERBINDING_INL diff --git a/include/IECorePython/TypedParameterBinding.h b/include/IECorePython/TypedParameterBinding.h index afd6132afd..57126e4e87 100644 --- a/include/IECorePython/TypedParameterBinding.h +++ b/include/IECorePython/TypedParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TYPEDPARAMETERBINDING_H -#define IECOREPYTHON_TYPEDPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -44,4 +43,3 @@ IECOREPYTHON_API void bindTypedParameter(); #include "IECorePython/TypedParameterBinding.inl" -#endif // IECOREPYTHON_TYPEDPARAMETERBINDING_H diff --git a/include/IECorePython/TypedParameterBinding.inl b/include/IECorePython/TypedParameterBinding.inl index 25b0d27bad..ad6c5a3a74 100644 --- a/include/IECorePython/TypedParameterBinding.inl +++ b/include/IECorePython/TypedParameterBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_TYPEDPARAMETERBINDING_INL -#define IECOREPYTHON_TYPEDPARAMETERBINDING_INL +#pragma once #include "IECorePython/ParameterBinding.h" #include "IECorePython/RunTimeTypedBinding.h" @@ -101,5 +100,3 @@ void bindTypedParameter() } } - -#endif // IECOREPYTHON_TYPEDPARAMETERBINDING_INL diff --git a/include/IECorePython/ValidatedStringParameterBinding.h b/include/IECorePython/ValidatedStringParameterBinding.h index 74c7c62e65..3c40ec30d1 100644 --- a/include/IECorePython/ValidatedStringParameterBinding.h +++ b/include/IECorePython/ValidatedStringParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_VALIDATEDSTRINGPARAMETERBINDING_H -#define IECOREPYTHON_VALIDATEDSTRINGPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindValidatedStringParameter(); } -#endif // IECOREPYTHON_VALIDATEDSTRINGPARAMETERBINDING_H diff --git a/include/IECorePython/VecTypedParameterBinding.h b/include/IECorePython/VecTypedParameterBinding.h index 9b01f669ac..1273829d88 100644 --- a/include/IECorePython/VecTypedParameterBinding.h +++ b/include/IECorePython/VecTypedParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_VECTYPEDPARAMETERBINDING_H -#define IECOREPYTHON_VECTYPEDPARAMETERBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindVecTypedParameter(); } -#endif // IECOREPYTHON_VECTYPEDPARAMETERBINDING_H diff --git a/include/IECorePython/VectorDataFilterOpBinding.h b/include/IECorePython/VectorDataFilterOpBinding.h index 5e067d0dd9..b86a34633f 100644 --- a/include/IECorePython/VectorDataFilterOpBinding.h +++ b/include/IECorePython/VectorDataFilterOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_VECTORDATAFILTEROPBINDING_H -#define IECOREPYTHON_VECTORDATAFILTEROPBINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,4 +41,3 @@ namespace IECorePython IECOREPYTHON_API void bindVectorDataFilterOp(); } -#endif // IECOREPYTHON_VECTORDATAFILTEROPBINDING_H diff --git a/include/IECorePython/VectorTypedDataBinding.h b/include/IECorePython/VectorTypedDataBinding.h index 735dd10cd8..d02fed9fdf 100644 --- a/include/IECorePython/VectorTypedDataBinding.h +++ b/include/IECorePython/VectorTypedDataBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_VECTORTYPEDDATABINDING_H -#define IECOREPYTHON_VECTORTYPEDDATABINDING_H +#pragma once #include "IECorePython/Export.h" @@ -42,5 +41,4 @@ namespace IECorePython extern IECOREPYTHON_API void bindAllVectorTypedData(); } -#endif // IECOREPYTHON_VECTORTYPEDDATABINDING_H diff --git a/include/IECorePython/VectorTypedDataBinding.inl b/include/IECorePython/VectorTypedDataBinding.inl index b8134652ec..d7bc104065 100644 --- a/include/IECorePython/VectorTypedDataBinding.inl +++ b/include/IECorePython/VectorTypedDataBinding.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHON_VECTORTYPEDDATABINDING_INL -#define IECOREPYTHON_VECTORTYPEDDATABINDING_INL +#pragma once #include "boost/python.hpp" @@ -797,5 +796,3 @@ std::string str > >( IECore::TypedData co #include "IECoreScene/MeshAlgo.inl" -#endif // IECORESCENE_MESHALGO_H diff --git a/include/IECoreScene/MeshAlgo.inl b/include/IECoreScene/MeshAlgo.inl index 40d9d302f0..1883017251 100644 --- a/include/IECoreScene/MeshAlgo.inl +++ b/include/IECoreScene/MeshAlgo.inl @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_MESHALGO_INL -#define IECORESCENE_MESHALGO_INL +#pragma once namespace IECoreScene { @@ -64,5 +63,3 @@ typename std::vector::const_reference IECoreScene::MeshAlgo::MeshSplitter::va } // namespace MeshAlgo } // namespace IECoreScene - -#endif // IECORESCENE_MESHALGO_INL diff --git a/include/IECoreScene/MeshMergeOp.h b/include/IECoreScene/MeshMergeOp.h index e7e668c1ec..9e0520f829 100644 --- a/include/IECoreScene/MeshMergeOp.h +++ b/include/IECoreScene/MeshMergeOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_MESHMERGEOP_H -#define IECORESCENE_MESHMERGEOP_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypedPrimitiveOp.h" @@ -71,5 +70,4 @@ IE_CORE_DECLAREPTR( MeshMergeOp ); } // namespace IECoreScene -#endif // IECORESCENE_MESHMERGEOP_H diff --git a/include/IECoreScene/MeshNormalsOp.h b/include/IECoreScene/MeshNormalsOp.h index 0f9be38bd7..208796c7d0 100644 --- a/include/IECoreScene/MeshNormalsOp.h +++ b/include/IECoreScene/MeshNormalsOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_MESHNORMALSOP_H -#define IECORESCENE_MESHNORMALSOP_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypedPrimitiveOp.h" @@ -79,5 +78,4 @@ IE_CORE_DECLAREPTR( MeshNormalsOp ); } // namespace IECoreScene -#endif // IECORESCENE_MESHNORMALSOP_H diff --git a/include/IECoreScene/MeshPrimitive.h b/include/IECoreScene/MeshPrimitive.h index e5f916f81d..0cea888e53 100644 --- a/include/IECoreScene/MeshPrimitive.h +++ b/include/IECoreScene/MeshPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_MESHPRIMITIVE_H -#define IECORESCENE_MESHPRIMITIVE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Primitive.h" @@ -185,5 +184,3 @@ class IECORESCENE_API MeshPrimitive : public Primitive }; } - -#endif // IECORE_MESHPRIMITIVE diff --git a/include/IECoreScene/MeshPrimitiveBuilder.h b/include/IECoreScene/MeshPrimitiveBuilder.h index feb87856a5..bc051a3841 100644 --- a/include/IECoreScene/MeshPrimitiveBuilder.h +++ b/include/IECoreScene/MeshPrimitiveBuilder.h @@ -33,8 +33,7 @@ ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_MESHPRIMITIVEBUILDER_H -#define IECORESCENE_MESHPRIMITIVEBUILDER_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/MeshPrimitive.h" @@ -79,5 +78,3 @@ class IECORESCENE_API MeshPrimitiveBuilder : public IECore::RefCounted IE_CORE_DECLAREPTR( MeshPrimitiveBuilder ); } - -#endif diff --git a/include/IECoreScene/MeshPrimitiveEvaluator.h b/include/IECoreScene/MeshPrimitiveEvaluator.h index d49ea8fb54..699761a83f 100644 --- a/include/IECoreScene/MeshPrimitiveEvaluator.h +++ b/include/IECoreScene/MeshPrimitiveEvaluator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_MESHPRIMITIVEEVALUATOR_H -#define IECORESCENE_MESHPRIMITIVEEVALUATOR_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/MeshPrimitive.h" @@ -223,4 +222,3 @@ IE_CORE_DECLAREPTR( MeshPrimitiveEvaluator ); } // namespace IECoreScene -#endif // IECORESCENE_MESHPRIMITIVEEVALUATOR_H diff --git a/include/IECoreScene/MeshPrimitiveShrinkWrapOp.h b/include/IECoreScene/MeshPrimitiveShrinkWrapOp.h index 17235648fe..9a27b9ac37 100644 --- a/include/IECoreScene/MeshPrimitiveShrinkWrapOp.h +++ b/include/IECoreScene/MeshPrimitiveShrinkWrapOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_MESHPRIMITIVESHRINKWRAPOP_H -#define IECORESCENE_MESHPRIMITIVESHRINKWRAPOP_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypedPrimitiveOp.h" @@ -115,4 +114,3 @@ IE_CORE_DECLAREPTR( MeshPrimitiveShrinkWrapOp ); } // namespace IECoreScene -#endif // IECORESCENE_MESHPRIMITIVESHRINKWRAPOP_H diff --git a/include/IECoreScene/MeshVertexReorderOp.h b/include/IECoreScene/MeshVertexReorderOp.h index c623e83b8b..1142c426c6 100755 --- a/include/IECoreScene/MeshVertexReorderOp.h +++ b/include/IECoreScene/MeshVertexReorderOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_MESHVERTEXREORDEROP_H -#define IECORESCENE_MESHVERTEXREORDEROP_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypedPrimitiveOp.h" @@ -76,5 +75,4 @@ IE_CORE_DECLAREPTR( MeshVertexReorderOp ); } // namespace IECoreScene -#endif // IECORESCENE_MESHVERTEXREORDEROP_H diff --git a/include/IECoreScene/NParticleReader.h b/include/IECoreScene/NParticleReader.h index f8f8b7792c..2673488c8f 100644 --- a/include/IECoreScene/NParticleReader.h +++ b/include/IECoreScene/NParticleReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_NPARTICLEREADER_H -#define IECORESCENE_NPARTICLEREADER_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/ParticleReader.h" @@ -121,4 +120,3 @@ IE_CORE_DECLAREPTR( NParticleReader ); } // namespace IECoreScene -#endif // IECORESCENE_NPARTICLEREADER_H diff --git a/include/IECoreScene/NURBSPrimitive.h b/include/IECoreScene/NURBSPrimitive.h index c149c0061d..e6a4a77385 100644 --- a/include/IECoreScene/NURBSPrimitive.h +++ b/include/IECoreScene/NURBSPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_NURBSPRIMITIVE_H -#define IECORESCENE_NURBSPRIMITIVE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Primitive.h" @@ -100,4 +99,3 @@ IE_CORE_DECLAREPTR( NURBSPrimitive ); } -#endif // IECORESCENE_NURBSPRIMITIVE_H diff --git a/include/IECoreScene/OBJReader.h b/include/IECoreScene/OBJReader.h index a7436b138d..28d22619ee 100644 --- a/include/IECoreScene/OBJReader.h +++ b/include/IECoreScene/OBJReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_OBJREADER_H -#define IECORESCENE_OBJREADER_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypeIds.h" @@ -100,4 +99,3 @@ IE_CORE_DECLAREPTR(OBJReader); } // namespace IECoreScene -#endif // IECORESCENE_OBJREADER_H diff --git a/include/IECoreScene/Output.h b/include/IECoreScene/Output.h index 4d1c73a524..52f2de746e 100644 --- a/include/IECoreScene/Output.h +++ b/include/IECoreScene/Output.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_OUTPUT_H -#define IECORESCENE_OUTPUT_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Renderable.h" @@ -84,4 +83,3 @@ IE_CORE_DECLAREPTR( Output ); } -#endif // IECORESCENE_OUTPUT_H diff --git a/include/IECoreScene/PDCParticleReader.h b/include/IECoreScene/PDCParticleReader.h index 3bec49bdf1..84f30e1dda 100644 --- a/include/IECoreScene/PDCParticleReader.h +++ b/include/IECoreScene/PDCParticleReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PDCPARTICLEREADER_H -#define IECORESCENE_PDCPARTICLEREADER_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/ParticleReader.h" @@ -117,4 +116,3 @@ IE_CORE_DECLAREPTR( PDCParticleReader ); } // namespace IECoreScene -#endif // IECORESCENE_PDCPARTICLEREADER_H diff --git a/include/IECoreScene/PDCParticleWriter.h b/include/IECoreScene/PDCParticleWriter.h index e4e465c3b5..49455305c6 100644 --- a/include/IECoreScene/PDCParticleWriter.h +++ b/include/IECoreScene/PDCParticleWriter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PDCPARTICLEWRITER_H -#define IECORESCENE_PDCPARTICLEWRITER_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/ParticleWriter.h" @@ -65,4 +64,3 @@ IE_CORE_DECLAREPTR( PDCParticleWriter ); } // namespace IECoreScene -#endif // IECORESCENE_PDCPARTICLEWRITER_H diff --git a/include/IECoreScene/ParticleReader.h b/include/IECoreScene/ParticleReader.h index aa9c15320a..8aad33e7bf 100644 --- a/include/IECoreScene/ParticleReader.h +++ b/include/IECoreScene/ParticleReader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PARTICLEREADER_H -#define IECORESCENE_PARTICLEREADER_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypeIds.h" @@ -151,4 +150,3 @@ IE_CORE_DECLAREPTR( ParticleReader ); } // namespace IECoreScene -#endif // IECORESCENE_PARTICLEREADER_H diff --git a/include/IECoreScene/ParticleReader.inl b/include/IECoreScene/ParticleReader.inl index 1e01bbf4c7..e8e91875ba 100644 --- a/include/IECoreScene/ParticleReader.inl +++ b/include/IECoreScene/ParticleReader.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_PARTICLEREADER_INL -#define IE_CORE_PARTICLEREADER_INL +#pragma once #include "IECore/Convert.h" #include "IECore/MessageHandler.h" @@ -123,5 +122,3 @@ typename T::Ptr ParticleReader::filterAttr( const F *attr, float percentage, con } } // namespace IECoreScene - -#endif // IE_CORE_PARTICLEREADER_INL diff --git a/include/IECoreScene/ParticleWriter.h b/include/IECoreScene/ParticleWriter.h index 199136203b..f3b27bc4da 100644 --- a/include/IECoreScene/ParticleWriter.h +++ b/include/IECoreScene/ParticleWriter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PARTICLEWRITER_H -#define IECORESCENE_PARTICLEWRITER_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypeIds.h" @@ -84,4 +83,3 @@ IE_CORE_DECLAREPTR( ParticleWriter ); } // namespace IECoreScene -#endif // IECORESCENE_PARTICLEWRITER_H diff --git a/include/IECoreScene/PatchMeshPrimitive.h b/include/IECoreScene/PatchMeshPrimitive.h index 1bb8473880..aa3c6ab5f5 100644 --- a/include/IECoreScene/PatchMeshPrimitive.h +++ b/include/IECoreScene/PatchMeshPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PATCHMESHPRIMITIVE_H -#define IECORESCENE_PATCHMESHPRIMITIVE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Primitive.h" @@ -104,4 +103,3 @@ IE_CORE_DECLAREPTR( PatchMeshPrimitive ); } // namespace IECoreScene -#endif // IECORESCENE_PATCHMESHPRIMITIVE_H diff --git a/include/IECoreScene/PointsAlgo.h b/include/IECoreScene/PointsAlgo.h index b778ef69f5..0d70393f33 100644 --- a/include/IECoreScene/PointsAlgo.h +++ b/include/IECoreScene/PointsAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_POINTSALGO_H -#define IECORESCENE_POINTSALGO_H +#pragma once #include "IECoreScene/PointsPrimitive.h" @@ -72,4 +71,3 @@ IECORESCENE_API std::vector segment( const PointsPrimitive * } // namespace IECoreScene -#endif // IECORESCENE_POINTSALGO_H diff --git a/include/IECoreScene/PointsPrimitive.h b/include/IECoreScene/PointsPrimitive.h index 30db1058b1..31ed8eeb53 100644 --- a/include/IECoreScene/PointsPrimitive.h +++ b/include/IECoreScene/PointsPrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_POINTSPRIMITIVE_H -#define IECORESCENE_POINTSPRIMITIVE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Primitive.h" @@ -88,4 +87,3 @@ IE_CORE_DECLAREPTR( PointsPrimitive ); } -#endif // IECORESCENE_POINTSPRIMITIVE_H diff --git a/include/IECoreScene/PointsPrimitiveEvaluator.h b/include/IECoreScene/PointsPrimitiveEvaluator.h index 016572aeff..501b6a9c3c 100644 --- a/include/IECoreScene/PointsPrimitiveEvaluator.h +++ b/include/IECoreScene/PointsPrimitiveEvaluator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_POINTSPRIMITIVEEVALUATOR_H -#define IECORESCENE_POINTSPRIMITIVEEVALUATOR_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/PrimitiveEvaluator.h" @@ -157,4 +156,3 @@ IE_CORE_DECLAREPTR( PointsPrimitiveEvaluator ); } // namespace IECoreScene -#endif // IECORESCENE_POINTSPRIMITIVEEVALUATOR_H diff --git a/include/IECoreScene/PolygonIterator.h b/include/IECoreScene/PolygonIterator.h index 06611dde8f..7be41017f6 100644 --- a/include/IECoreScene/PolygonIterator.h +++ b/include/IECoreScene/PolygonIterator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_POLYGONITERATOR_H -#define IECORESCENE_POLYGONITERATOR_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/PolygonVertexIterator.h" @@ -101,4 +100,3 @@ class IECORESCENE_API PolygonIterator #include "IECoreScene/PolygonIterator.inl" -#endif // IECORESCENE_POLYGONITERATOR_H diff --git a/include/IECoreScene/PolygonIterator.inl b/include/IECoreScene/PolygonIterator.inl index 184a91bcf1..7ea6be0e39 100644 --- a/include/IECoreScene/PolygonIterator.inl +++ b/include/IECoreScene/PolygonIterator.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_POLYGONITERATOR_INL -#define IECORESCENE_POLYGONITERATOR_INL +#pragma once namespace IECoreScene { @@ -97,5 +96,3 @@ ValueIterator PolygonIterator::faceVaryingEnd( ValueIterator valuesBegin ) const } // namespace IECoreScene - -#endif // IECORESCENE_POLYGONITERATOR_INL diff --git a/include/IECoreScene/PolygonVertexIterator.h b/include/IECoreScene/PolygonVertexIterator.h index 6f320e45c0..61c2f314cb 100644 --- a/include/IECoreScene/PolygonVertexIterator.h +++ b/include/IECoreScene/PolygonVertexIterator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_POLYGONVERTEXITERATOR_H -#define IECORESCENE_POLYGONVERTEXITERATOR_H +#pragma once #include @@ -86,4 +85,3 @@ class PolygonVertexIterator #include "IECoreScene/PolygonVertexIterator.inl" -#endif // IECORESCENE_POLYGONVERTEXITERATOR_H diff --git a/include/IECoreScene/PolygonVertexIterator.inl b/include/IECoreScene/PolygonVertexIterator.inl index 0e4cee0f2f..097fa5c946 100644 --- a/include/IECoreScene/PolygonVertexIterator.inl +++ b/include/IECoreScene/PolygonVertexIterator.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_POLYGONVERTEXITERATOR_INL -#define IECORESCENE_POLYGONVERTEXITERATOR_INL +#pragma once namespace IECoreScene { @@ -89,5 +88,3 @@ bool PolygonVertexIterator::operator!= } } // namespace IECoreScene - -#endif // IECORESCENE_POLYGONVERTEXITERATOR_INL diff --git a/include/IECoreScene/Primitive.h b/include/IECoreScene/Primitive.h index 6ed1a3262c..926b1cd032 100644 --- a/include/IECoreScene/Primitive.h +++ b/include/IECoreScene/Primitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PRIMITIVE_H -#define IECORESCENE_PRIMITIVE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/PrimitiveVariable.h" @@ -160,4 +159,3 @@ IE_CORE_DECLAREPTR( Primitive ); #include "IECoreScene/Primitive.inl" -#endif // IECORESCENE_PRIMITIVE_H diff --git a/include/IECoreScene/Primitive.inl b/include/IECoreScene/Primitive.inl index e4895c2248..7d6da60fca 100644 --- a/include/IECoreScene/Primitive.inl +++ b/include/IECoreScene/Primitive.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PRIMITIVE_INL -#define IECORESCENE_PRIMITIVE_INL +#pragma once namespace IECoreScene { @@ -191,5 +190,3 @@ typename T::Ptr Primitive::expandedVariableData( const std::string &name, Primit } } // namespace IECoreScene - -#endif // IECORESCENE_PRIMITIVE_INL diff --git a/include/IECoreScene/PrimitiveEvaluator.h b/include/IECoreScene/PrimitiveEvaluator.h index 4263d63430..88ddcabd27 100644 --- a/include/IECoreScene/PrimitiveEvaluator.h +++ b/include/IECoreScene/PrimitiveEvaluator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PRIMITIVEEVALUATOR_H -#define IECORESCENE_PRIMITIVEEVALUATOR_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Primitive.h" @@ -192,4 +191,3 @@ IE_CORE_DECLAREPTR( PrimitiveEvaluator ); } // namespace IECoreScene -#endif // IECORESCENE_PRIMITIVEEVALUATOR_H diff --git a/include/IECoreScene/PrimitiveOp.h b/include/IECoreScene/PrimitiveOp.h index d64f29b1ad..adeb1259fe 100644 --- a/include/IECoreScene/PrimitiveOp.h +++ b/include/IECoreScene/PrimitiveOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PRIMITIVEOP_H -#define IECORESCENE_PRIMITIVEOP_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypeIds.h" @@ -69,4 +68,3 @@ IE_CORE_DECLAREPTR( PrimitiveOp ); } // namespace IECoreScene -#endif // IECORESCENE_PRIMITIVEOP_H diff --git a/include/IECoreScene/PrimitiveVariable.h b/include/IECoreScene/PrimitiveVariable.h index 50fef90747..536ec5b271 100644 --- a/include/IECoreScene/PrimitiveVariable.h +++ b/include/IECoreScene/PrimitiveVariable.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PRIMITIVEVARIABLE_H -#define IECORESCENE_PRIMITIVEVARIABLE_H +#pragma once #include "IECoreScene/Export.h" @@ -192,4 +191,3 @@ typedef std::map PrimitiveVariableMap; #include "IECoreScene/PrimitiveVariable.inl" -#endif // IECORESCENE_PRIMITIVEVARIABLE_H diff --git a/include/IECoreScene/PrimitiveVariable.inl b/include/IECoreScene/PrimitiveVariable.inl index 9f2b4e7d33..d44ad457d8 100644 --- a/include/IECoreScene/PrimitiveVariable.inl +++ b/include/IECoreScene/PrimitiveVariable.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PRIMITIVEVARIABLE_INL -#define IECORESCENE_PRIMITIVEVARIABLE_INL +#pragma once #include "IECoreScene/Export.h" @@ -182,5 +181,3 @@ typename PrimitiveVariable::IndexedView::Iterator PrimitiveVariable::IndexedV typedef std::map PrimitiveVariableMap; } // namespace IECoreScene - -#endif // IECORESCENE_PRIMITIVEVARIABLE_INL diff --git a/include/IECoreScene/Renderable.h b/include/IECoreScene/Renderable.h index 4cb26d6398..72a27a48a4 100644 --- a/include/IECoreScene/Renderable.h +++ b/include/IECoreScene/Renderable.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_RENDERABLE_H -#define IECORESCENE_RENDERABLE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypeIds.h" @@ -63,4 +62,3 @@ IE_CORE_DECLAREPTR( Renderable ); } -#endif // IECORESCENE_RENDERABLE_H diff --git a/include/IECoreScene/SampledSceneInterface.h b/include/IECoreScene/SampledSceneInterface.h index 521ab6b32c..63f1bda3f1 100644 --- a/include/IECoreScene/SampledSceneInterface.h +++ b/include/IECoreScene/SampledSceneInterface.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SAMPLEDSCENEINTERFACE_H -#define IECORESCENE_SAMPLEDSCENEINTERFACE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/SceneInterface.h" @@ -125,4 +124,3 @@ class IECORESCENE_API SampledSceneInterface : public SceneInterface } // namespace IECoreScene -#endif // IECORESCENE_SAMPLEDSCENEINTERFACE_H diff --git a/include/IECoreScene/SceneAlgo.h b/include/IECoreScene/SceneAlgo.h index 7b601be9aa..eda4a2841f 100644 --- a/include/IECoreScene/SceneAlgo.h +++ b/include/IECoreScene/SceneAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SCENEALGO_H -#define IECORESCENE_SCENEALGO_H +#pragma once #include "IECoreScene/Export.h" @@ -71,4 +70,3 @@ IECORESCENE_API void copy( const SceneInterface *src, SceneInterface *dst, int s } // IECoreScene -#endif // IECORESCENE_SCENEALGO_H \ No newline at end of file diff --git a/include/IECoreScene/SceneCache.h b/include/IECoreScene/SceneCache.h index 3a16e8c4fb..f87c934bb7 100644 --- a/include/IECoreScene/SceneCache.h +++ b/include/IECoreScene/SceneCache.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SCENECACHE_H -#define IECORESCENE_SCENECACHE_H +#pragma once #include "IECore/PathMatcherData.h" @@ -167,4 +166,3 @@ class IECORESCENE_API SceneCache : public SampledSceneInterface } // namespace IECoreScene -#endif // IECORESCENE_SCENECACHE_H diff --git a/include/IECoreScene/SceneInterface.h b/include/IECoreScene/SceneInterface.h index fbf0fbdf5c..bb542f3449 100644 --- a/include/IECoreScene/SceneInterface.h +++ b/include/IECoreScene/SceneInterface.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SCENEINTERFACE_H -#define IECORESCENE_SCENEINTERFACE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/PrimitiveVariable.h" @@ -312,4 +311,3 @@ IECORESCENE_API std::ostream &operator <<( std::ostream &o, const SceneInterface #include "IECoreScene/SceneInterface.inl" -#endif // IECORESCENE_SCENEINTERFACE_H diff --git a/include/IECoreScene/SceneInterface.inl b/include/IECoreScene/SceneInterface.inl index 40d118f63c..330b2c5d54 100644 --- a/include/IECoreScene/SceneInterface.inl +++ b/include/IECoreScene/SceneInterface.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_SCENEINTERFACE_INL -#define IE_CORE_SCENEINTERFACE_INL +#pragma once namespace IECoreScene { @@ -51,5 +50,3 @@ SceneInterfacePtr SceneInterface::FileFormatDescription::creator( const std:: } } // namespace IECoreScene - -#endif // IE_CORE_SCENEINTERFACE_INL diff --git a/include/IECoreScene/Shader.h b/include/IECoreScene/Shader.h index 8d8b952a39..479911fc6b 100644 --- a/include/IECoreScene/Shader.h +++ b/include/IECoreScene/Shader.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SHADER_H -#define IECORESCENE_SHADER_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Renderable.h" @@ -86,4 +85,3 @@ IE_CORE_DECLAREPTR( Shader ); } // namespace IECoreScene -#endif // IECORESCENE_SHADER_H diff --git a/include/IECoreScene/ShaderNetwork.h b/include/IECoreScene/ShaderNetwork.h index e1aedef495..6a618713a3 100644 --- a/include/IECoreScene/ShaderNetwork.h +++ b/include/IECoreScene/ShaderNetwork.h @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SHADERNETWORK_H -#define IECORESCENE_SHADERNETWORK_H +#pragma once #include "IECoreScene/Shader.h" #include "IECoreScene/TypeIds.h" @@ -235,4 +234,3 @@ IE_CORE_DECLAREPTR( ShaderNetwork ) #include "IECoreScene/ShaderNetwork.inl" -#endif // IECORESCENE_SHADERNETWORK_H diff --git a/include/IECoreScene/ShaderNetwork.inl b/include/IECoreScene/ShaderNetwork.inl index 7eb97de0b0..fcd0408e9f 100644 --- a/include/IECoreScene/ShaderNetwork.inl +++ b/include/IECoreScene/ShaderNetwork.inl @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SHADERNETWORK_INL -#define IECORESCENE_SHADERNETWORK_INL +#pragma once #include "boost/functional/hash.hpp" #include "boost/iterator/iterator_facade.hpp" @@ -199,5 +198,3 @@ struct hash }; } // namespace std - -#endif // IECORESCENE_SHADERNETWORK_INL diff --git a/include/IECoreScene/ShaderNetworkAlgo.h b/include/IECoreScene/ShaderNetworkAlgo.h index bbf9e49b2b..16fa4d072d 100644 --- a/include/IECoreScene/ShaderNetworkAlgo.h +++ b/include/IECoreScene/ShaderNetworkAlgo.h @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SHADERNETWORKALGO_H -#define IECORESCENE_SHADERNETWORKALGO_H +#pragma once #include "IECore/ObjectVector.h" @@ -175,4 +174,3 @@ IECORESCENE_API void applyRenderAdaptors( ShaderNetwork *shaderNetwork, IECore:: } // namespace IECoreScene #include "IECoreScene/ShaderNetworkAlgo.inl" -#endif // IECORESCENE_SHADERNETWORKALGO_H diff --git a/include/IECoreScene/ShaderNetworkAlgo.inl b/include/IECoreScene/ShaderNetworkAlgo.inl index c4f259e2f0..2be16368f8 100644 --- a/include/IECoreScene/ShaderNetworkAlgo.inl +++ b/include/IECoreScene/ShaderNetworkAlgo.inl @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SHADERNETWORKALGO_INL -#define IECORESCENE_SHADERNETWORKALGO_INL +#pragma once #include @@ -84,5 +83,3 @@ void depthFirstTraverse( const ShaderNetwork *network, Visitor &&visitor, IECore } // namespace ShaderNetworkAlgo } // namespace IECoreScene - -#endif // IECORESCENE_SHADERNETWORKALGO_INL diff --git a/include/IECoreScene/SharedSceneInterfaces.h b/include/IECoreScene/SharedSceneInterfaces.h index f44fa7fd1e..41f7303ec0 100644 --- a/include/IECoreScene/SharedSceneInterfaces.h +++ b/include/IECoreScene/SharedSceneInterfaces.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SHAREDSCENEINTERFACES_H -#define IECORESCENE_SHAREDSCENEINTERFACES_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/SceneInterface.h" @@ -67,4 +66,3 @@ class IECORESCENE_API SharedSceneInterfaces } // namespace IECoreScene -#endif // IECORESCENE_SHAREDSCENEINTERFACES_H diff --git a/include/IECoreScene/SpherePrimitive.h b/include/IECoreScene/SpherePrimitive.h index 52118edb1e..aad7380df4 100644 --- a/include/IECoreScene/SpherePrimitive.h +++ b/include/IECoreScene/SpherePrimitive.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SPHEREPRIMITIVE_H -#define IECORESCENE_SPHEREPRIMITIVE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Primitive.h" @@ -101,5 +100,3 @@ class IECORESCENE_API SpherePrimitive : public Primitive IE_CORE_DECLAREPTR( SpherePrimitive ); } - -#endif // IECORE_SPHEREPRIMITIVE diff --git a/include/IECoreScene/SpherePrimitiveEvaluator.h b/include/IECoreScene/SpherePrimitiveEvaluator.h index 1ae82deac6..8e310bbb51 100644 --- a/include/IECoreScene/SpherePrimitiveEvaluator.h +++ b/include/IECoreScene/SpherePrimitiveEvaluator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_SPHEREPRIMITIVEEVALUATOR_H -#define IECORESCENE_SPHEREPRIMITIVEEVALUATOR_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/PrimitiveEvaluator.h" @@ -127,4 +126,3 @@ IE_CORE_DECLAREPTR( SpherePrimitiveEvaluator ); } // namespace IECoreScene -#endif // IECORESCENE_SPHEREPRIMITIVEEVALUATOR_H diff --git a/include/IECoreScene/TransformOp.h b/include/IECoreScene/TransformOp.h index 1f9564db1e..b94236c204 100644 --- a/include/IECoreScene/TransformOp.h +++ b/include/IECoreScene/TransformOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TRANSFORMOP_H -#define IECORESCENE_TRANSFORMOP_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/PrimitiveOp.h" @@ -79,4 +78,3 @@ IE_CORE_DECLAREPTR( TransformOp ); } // namespace IECoreScene -#endif // IECORESCENE_TRANSFORMOP_H diff --git a/include/IECoreScene/TriangulateOp.h b/include/IECoreScene/TriangulateOp.h index 4b39dc15ea..2d9a5115be 100644 --- a/include/IECoreScene/TriangulateOp.h +++ b/include/IECoreScene/TriangulateOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TRIANGULATEOP_H -#define IECORESCENE_TRIANGULATEOP_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/TypedPrimitiveOp.h" @@ -79,5 +78,4 @@ IE_CORE_DECLAREPTR( TriangulateOp ); } // namespace IECoreScene -#endif // IECORESCENE_TRIANGULATEOP_H diff --git a/include/IECoreScene/Triangulator.h b/include/IECoreScene/Triangulator.h index cbf27ca792..352ef2ed77 100644 --- a/include/IECoreScene/Triangulator.h +++ b/include/IECoreScene/Triangulator.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TRIANGULATOR_H -#define IECORESCENE_TRIANGULATOR_H +#pragma once #include "IECoreScene/MeshPrimitiveBuilder.h" @@ -115,4 +114,3 @@ typedef Triangulator::const_iterator> V3dTriangulator; #include "IECoreScene/Triangulator.inl" -#endif // IECORESCENE_TRIANGULATOR_H diff --git a/include/IECoreScene/Triangulator.inl b/include/IECoreScene/Triangulator.inl index 76d646ae63..8bccdfc0f4 100644 --- a/include/IECoreScene/Triangulator.inl +++ b/include/IECoreScene/Triangulator.inl @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TRIANGULATOR_INL -#define IECORESCENE_TRIANGULATOR_INL +#pragma once #include "IECore/TriangleAlgo.h" @@ -259,5 +258,3 @@ void Triangulator::triangulate( VertexList &vertices } } // namespace IECoreScene - -#endif // IECORESCENE_TRIANGULATOR_INL diff --git a/include/IECoreScene/TypeIds.h b/include/IECoreScene/TypeIds.h index 41c2ed9d9b..c5102b336f 100644 --- a/include/IECoreScene/TypeIds.h +++ b/include/IECoreScene/TypeIds.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TYPEIDS_H -#define IECORESCENE_TYPEIDS_H +#pragma once namespace IECoreScene { @@ -143,4 +142,3 @@ enum TypeId } // namespace IECoreScene -#endif // IECORESCENE_TYPEIDS_H diff --git a/include/IECoreScene/TypedObjectParameter.h b/include/IECoreScene/TypedObjectParameter.h index 832ee00c46..059000443b 100644 --- a/include/IECoreScene/TypedObjectParameter.h +++ b/include/IECoreScene/TypedObjectParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TYPEDOBJECTPARAMETER_H -#define IECORESCENE_TYPEDOBJECTPARAMETER_H +#pragma once #include "IECore/TypedObjectParameter.h" @@ -54,4 +53,3 @@ IE_CORE_DECLAREPTR( VisibleRenderableParameter ); } // namespace IECoreScene -#endif // IECORESCENE_TYPEDOBJECTPARAMETER_H diff --git a/include/IECoreScene/TypedPrimitiveOp.h b/include/IECoreScene/TypedPrimitiveOp.h index 3ee0872112..bb80d42b49 100644 --- a/include/IECoreScene/TypedPrimitiveOp.h +++ b/include/IECoreScene/TypedPrimitiveOp.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TYPEDPRIMITIVEOP_H -#define IECORESCENE_TYPEDPRIMITIVEOP_H +#pragma once #include "IECoreScene/CurvesPrimitive.h" #include "IECoreScene/MeshPrimitive.h" @@ -78,4 +77,3 @@ IE_CORE_DEFINETYPEDPRIMITIVEOP( CurvesPrimitive ) } // namespace IECoreScene -#endif // IECORESCENE_TYPEDPRIMITIVEOP_H diff --git a/include/IECoreScene/TypedPrimitiveParameter.h b/include/IECoreScene/TypedPrimitiveParameter.h index aa32b19b8e..6c236054d7 100644 --- a/include/IECoreScene/TypedPrimitiveParameter.h +++ b/include/IECoreScene/TypedPrimitiveParameter.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TYPEDPRIMITIVEPARAMETER_H -#define IECORESCENE_TYPEDPRIMITIVEPARAMETER_H +#pragma once #include "IECore/TypedObjectParameter.h" @@ -57,4 +56,3 @@ IE_CORE_DECLAREPTR( PointsPrimitiveParameter ); } // namespace IECoreScene -#endif // IECORESCENE_TYPEDPRIMITIVEPARAMETER_H diff --git a/include/IECoreScene/VisibleRenderable.h b/include/IECoreScene/VisibleRenderable.h index 6e2dd82235..11eeaa07ee 100644 --- a/include/IECoreScene/VisibleRenderable.h +++ b/include/IECoreScene/VisibleRenderable.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_VISIBLERENDERABLE_H -#define IECORESCENE_VISIBLERENDERABLE_H +#pragma once #include "IECoreScene/Export.h" #include "IECoreScene/Renderable.h" @@ -74,4 +73,3 @@ IE_CORE_DECLAREPTR( VisibleRenderable ); } -#endif // IECORESCENE_VISIBLERENDERABLE_H diff --git a/include/IECoreScene/private/PrimitiveAlgoUtils.h b/include/IECoreScene/private/PrimitiveAlgoUtils.h index bd7505930a..31da05ae37 100644 --- a/include/IECoreScene/private/PrimitiveAlgoUtils.h +++ b/include/IECoreScene/private/PrimitiveAlgoUtils.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PRIMITIVEALGOUTILS_H -#define IECORESCENE_PRIMITIVEALGOUTILS_H +#pragma once #include "IECoreScene/CurvesPrimitive.h" #include "IECoreScene/MeshPrimitive.h" @@ -336,4 +335,3 @@ class TaskSegmenter } // namespace Detail } // namespace IECoreScene -#endif // IECORESCENE_PRIMITIVEALGOUTILS_H diff --git a/include/IECoreScene/private/PrimitiveVariableAlgos.h b/include/IECoreScene/private/PrimitiveVariableAlgos.h index fa7162ae64..56eeeb5ec5 100644 --- a/include/IECoreScene/private/PrimitiveVariableAlgos.h +++ b/include/IECoreScene/private/PrimitiveVariableAlgos.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_PRIMITIVEVARIABLEALGOS_H -#define IECORESCENE_PRIMITIVEVARIABLEALGOS_H +#pragma once #include "IECoreScene/PrimitiveVariable.h" #include "IECoreScene/CurvesPrimitive.h" @@ -423,6 +422,3 @@ class DeleteFlaggedVertexFunctor : public DeleteFlagged } // PrimitiveVariableAlgos } // IECoreScene - - -#endif // IECORESCENE_PRIMITIVEVARIABLEALGOS_H diff --git a/include/IECoreScene/private/TransformStack.h b/include/IECoreScene/private/TransformStack.h index a0b2e6a84c..f184de2d7d 100644 --- a/include/IECoreScene/private/TransformStack.h +++ b/include/IECoreScene/private/TransformStack.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TRANSFORMSTACK_H -#define IECORESCENE_TRANSFORMSTACK_H +#pragma once #include "IECoreScene/Export.h" @@ -102,4 +101,3 @@ class IECORESCENE_API TransformStack } // namespace IECoreScene -#endif // IECORESCENE_TRANSFORMSTACK_H diff --git a/include/IECoreVDB/Export.h b/include/IECoreVDB/Export.h index abe0a59509..d14e3d9ef0 100644 --- a/include/IECoreVDB/Export.h +++ b/include/IECoreVDB/Export.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREVDB_EXPORT_H -#define IECOREVDB_EXPORT_H +#pragma once #include "IECore/Export.h" @@ -42,5 +41,3 @@ #else #define IECOREVDB_API IECORE_IMPORT #endif - -#endif // #ifndef IECOREVDB_EXPORT_H diff --git a/include/IECoreVDB/TypeIds.h b/include/IECoreVDB/TypeIds.h index 61bef461f8..f25f4dfa3f 100644 --- a/include/IECoreVDB/TypeIds.h +++ b/include/IECoreVDB/TypeIds.h @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREVDB_TYPEIDS_H -#define IECOREVDB_TYPEIDS_H +#pragma once namespace IECoreVDB { @@ -49,4 +48,3 @@ enum TypeId } // namespace IECoreVDB -#endif // IECOREVDB_TYPEIDS_H diff --git a/include/IECoreVDB/VDBObject.h b/include/IECoreVDB/VDBObject.h index a37fdf1edb..d719d825e5 100644 --- a/include/IECoreVDB/VDBObject.h +++ b/include/IECoreVDB/VDBObject.h @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREVDB_VDBOBJECT_H -#define IECOREVDB_VDBOBJECT_H +#pragma once #include "IECoreVDB/Export.h" #include "IECoreVDB/TypeIds.h" @@ -154,4 +153,3 @@ IE_CORE_DECLAREPTR( VDBObject ) } // namespace IECoreVDB -#endif // IECOREVDB_VDBOBJECT_H diff --git a/src/IECorePythonModule/TBBBinding.h b/src/IECorePythonModule/TBBBinding.h index fb29b69698..0308cdb46b 100644 --- a/src/IECorePythonModule/TBBBinding.h +++ b/src/IECorePythonModule/TBBBinding.h @@ -34,8 +34,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECOREPYTHONMODULE_TBBBINDING_H -#define IECOREPYTHONMODULE_TBBBINDING_H +#pragma once namespace IECorePythonModule { @@ -44,4 +43,3 @@ void bindTBB(); } // namespace IECorePythonModule -#endif // IECOREPYTHONMODULE_TBBBINDING_H diff --git a/src/IECoreScene/TagSetAlgo.h b/src/IECoreScene/TagSetAlgo.h index 341e004803..413dac479b 100644 --- a/src/IECoreScene/TagSetAlgo.h +++ b/src/IECoreScene/TagSetAlgo.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENE_TAGSETALGO_H -#define IECORESCENE_TAGSETALGO_H +#pragma once #include "IECoreScene/SceneInterface.h" @@ -76,5 +75,3 @@ namespace IECoreScene } // private } // IECoreScene - -#endif //IECORESCENE_TAGSETALGO_H diff --git a/src/IECoreScene/bindings/CameraBinding.h b/src/IECoreScene/bindings/CameraBinding.h index 0a33f2aad1..63deb00c0c 100644 --- a/src/IECoreScene/bindings/CameraBinding.h +++ b/src/IECoreScene/bindings/CameraBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_CAMERABINDING_H -#define IECORESCENEMODULE_CAMERABINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindCamera(); } -#endif // IECORESCENEMODULE_CAMERABINDING_H diff --git a/src/IECoreScene/bindings/ClippingPlaneBinding.h b/src/IECoreScene/bindings/ClippingPlaneBinding.h index 0101df1221..ed790a2a0e 100644 --- a/src/IECoreScene/bindings/ClippingPlaneBinding.h +++ b/src/IECoreScene/bindings/ClippingPlaneBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_CLIPPINGPLANEBINDING_H -#define IECORESCENEMODULE_CLIPPINGPLANEBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindClippingPlane(); } -#endif // IECORESCENEMODULE_CLIPPINGPLANEBINDING_H diff --git a/src/IECoreScene/bindings/CoordinateSystemBinding.h b/src/IECoreScene/bindings/CoordinateSystemBinding.h index 1f6d7bf626..977a8a655c 100644 --- a/src/IECoreScene/bindings/CoordinateSystemBinding.h +++ b/src/IECoreScene/bindings/CoordinateSystemBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef ICOREPYTHON_COORDINATESYSTEMBINDING_H -#define ICOREPYTHON_COORDINATESYSTEMBINDING_H +#pragma once namespace IECoreSceneModule { void bindCoordinateSystem(); } -#endif // ICOREPYTHON_COORDINATESYSTEMBINDING_H diff --git a/src/IECoreScene/bindings/CurveLineariserBinding.h b/src/IECoreScene/bindings/CurveLineariserBinding.h index 824d35fb26..ab842ad311 100644 --- a/src/IECoreScene/bindings/CurveLineariserBinding.h +++ b/src/IECoreScene/bindings/CurveLineariserBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_CURVELINEARISERBINDING_H -#define IECORESCENEMODULE_CURVELINEARISERBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindCurveLineariser(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_CURVELINEARISERBINDING_H diff --git a/src/IECoreScene/bindings/CurveTangentsOpBinding.h b/src/IECoreScene/bindings/CurveTangentsOpBinding.h index ea26057c38..dd6c7d067d 100644 --- a/src/IECoreScene/bindings/CurveTangentsOpBinding.h +++ b/src/IECoreScene/bindings/CurveTangentsOpBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_CURVETANGENTSOPBINDING_H -#define IECORESCENEMODULE_CURVETANGENTSOPBINDING_H +#pragma once namespace IECoreSceneModule { void bindCurveTangentsOp(); } -#endif // IECORESCENEMODULE_CURVETANGENTSOPBINDING_H diff --git a/src/IECoreScene/bindings/CurvesAlgoBinding.h b/src/IECoreScene/bindings/CurvesAlgoBinding.h index 99b391fab1..b31ca0ab80 100644 --- a/src/IECoreScene/bindings/CurvesAlgoBinding.h +++ b/src/IECoreScene/bindings/CurvesAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_CURVESALGOBINDING_H -#define IECORESCENEMODULE_CURVESALGOBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindCurvesAlgo(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_CURVESALGOBINDING_H diff --git a/src/IECoreScene/bindings/CurvesMergeOpBinding.h b/src/IECoreScene/bindings/CurvesMergeOpBinding.h index 443a3f89a0..690b85c25f 100644 --- a/src/IECoreScene/bindings/CurvesMergeOpBinding.h +++ b/src/IECoreScene/bindings/CurvesMergeOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_CURVESMERGEOPBINDING_H -#define IECORESCENEMODULE_CURVESMERGEOPBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindCurvesMergeOp(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_CURVESMERGEOPBINDING_H diff --git a/src/IECoreScene/bindings/CurvesPrimitiveBinding.h b/src/IECoreScene/bindings/CurvesPrimitiveBinding.h index cfbf1b8be0..891abc1e3b 100644 --- a/src/IECoreScene/bindings/CurvesPrimitiveBinding.h +++ b/src/IECoreScene/bindings/CurvesPrimitiveBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_CURVESPRIMITIVEBINDING_H -#define IECORESCENEMODULE_CURVESPRIMITIVEBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindCurvesPrimitive(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_CURVESPRIMITIVEBINDING_H diff --git a/src/IECoreScene/bindings/CurvesPrimitiveEvaluatorBinding.h b/src/IECoreScene/bindings/CurvesPrimitiveEvaluatorBinding.h index e0155ad0c8..babe855aa5 100644 --- a/src/IECoreScene/bindings/CurvesPrimitiveEvaluatorBinding.h +++ b/src/IECoreScene/bindings/CurvesPrimitiveEvaluatorBinding.h @@ -32,13 +32,11 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_CURVESPRIMITIVEEVALUATORBINDING_H -#define IECORESCENEMODULE_CURVESPRIMITIVEEVALUATORBINDING_H +#pragma once namespace IECoreSceneModule { void bindCurvesPrimitiveEvaluator(); } -#endif // IECORESCENEMODULE_CURVESPRIMITIVEEVALUATORBINDING_H diff --git a/src/IECoreScene/bindings/DiskPrimitiveBinding.h b/src/IECoreScene/bindings/DiskPrimitiveBinding.h index da2a92e0de..cd764be9c2 100644 --- a/src/IECoreScene/bindings/DiskPrimitiveBinding.h +++ b/src/IECoreScene/bindings/DiskPrimitiveBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_DISKPRIMITIVEBINDING_H -#define IECORESCENEMODULE_DISKPRIMITIVEBINDING_H +#pragma once namespace IECoreSceneModule { void bindDiskPrimitive(); } -#endif // IECORESCENEMODULE_DISKPRIMITIVEBINDING_H diff --git a/src/IECoreScene/bindings/ExternalProceduralBinding.h b/src/IECoreScene/bindings/ExternalProceduralBinding.h index 1873853397..ef6b95b769 100644 --- a/src/IECoreScene/bindings/ExternalProceduralBinding.h +++ b/src/IECoreScene/bindings/ExternalProceduralBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_EXTERNALPROCEDURALBINDING_H -#define IECORESCENEMODULE_EXTERNALPROCEDURALBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindExternalProcedural(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_EXTERNALPROCEDURALBINDING_H diff --git a/src/IECoreScene/bindings/FaceVaryingPromotionOpBinding.h b/src/IECoreScene/bindings/FaceVaryingPromotionOpBinding.h index 388eb20fd9..e92967dc96 100644 --- a/src/IECoreScene/bindings/FaceVaryingPromotionOpBinding.h +++ b/src/IECoreScene/bindings/FaceVaryingPromotionOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_FACEVARYINGPROMOTIONOPBINDING_H -#define IECORESCENEMODULE_FACEVARYINGPROMOTIONOPBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindFaceVaryingPromotionOp(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_FACEVARYINGPROMOTIONOPBINDING_H diff --git a/src/IECoreScene/bindings/FontBinding.h b/src/IECoreScene/bindings/FontBinding.h index 5257833c1a..839b0c92a1 100644 --- a/src/IECoreScene/bindings/FontBinding.h +++ b/src/IECoreScene/bindings/FontBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_FONTBINDING_H -#define IECORESCENEMODULE_FONTBINDING_H +#pragma once namespace IECoreSceneModule { void bindFont(); } -#endif // IECORESCENEMODULE_FONTBINDING_H diff --git a/src/IECoreScene/bindings/LinkedSceneBinding.h b/src/IECoreScene/bindings/LinkedSceneBinding.h index c6f26deb73..99d11f9d15 100644 --- a/src/IECoreScene/bindings/LinkedSceneBinding.h +++ b/src/IECoreScene/bindings/LinkedSceneBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_LINKEDSCENEBINDING_H -#define IECORESCENEMODULE_LINKEDSCENEBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindLinkedScene(); } -#endif // IECORESCENEMODULE_LINKEDSCENEBINDING_H diff --git a/src/IECoreScene/bindings/MeshAlgoBinding.h b/src/IECoreScene/bindings/MeshAlgoBinding.h index 1b05e16736..0db1514ab1 100644 --- a/src/IECoreScene/bindings/MeshAlgoBinding.h +++ b/src/IECoreScene/bindings/MeshAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_MESHALGOBINDING_H -#define IECORESCENEMODULE_MESHALGOBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindMeshAlgo(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_MESHALGOBINDING_H diff --git a/src/IECoreScene/bindings/MeshMergeOpBinding.h b/src/IECoreScene/bindings/MeshMergeOpBinding.h index 9d4e222cf9..9840f7562a 100644 --- a/src/IECoreScene/bindings/MeshMergeOpBinding.h +++ b/src/IECoreScene/bindings/MeshMergeOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_MESHMERGEOPBINDING_H -#define IECORESCENEMODULE_MESHMERGEOPBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindMeshMergeOp(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_MESHMERGEOPBINDING_H diff --git a/src/IECoreScene/bindings/MeshNormalsOpBinding.h b/src/IECoreScene/bindings/MeshNormalsOpBinding.h index 0abf421af3..42d362111b 100644 --- a/src/IECoreScene/bindings/MeshNormalsOpBinding.h +++ b/src/IECoreScene/bindings/MeshNormalsOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_MESHNORMALSOPBINDING_H -#define IECORESCENEMODULE_MESHNORMALSOPBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindMeshNormalsOp(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_MESHNORMALSOPBINDING_H diff --git a/src/IECoreScene/bindings/MeshPrimitiveBinding.h b/src/IECoreScene/bindings/MeshPrimitiveBinding.h index 3740783beb..47e3f30b2d 100644 --- a/src/IECoreScene/bindings/MeshPrimitiveBinding.h +++ b/src/IECoreScene/bindings/MeshPrimitiveBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_MESHPRIMITIVEBINDING_H -#define IECORESCENEMODULE_MESHPRIMITIVEBINDING_H +#pragma once namespace IECoreSceneModule { void bindMeshPrimitive(); } -#endif // IECORESCENEMODULE_MESHPRIMITIVEBINDING_H diff --git a/src/IECoreScene/bindings/MeshPrimitiveBuilderBinding.h b/src/IECoreScene/bindings/MeshPrimitiveBuilderBinding.h index 9651a7c4b3..5e08583d30 100644 --- a/src/IECoreScene/bindings/MeshPrimitiveBuilderBinding.h +++ b/src/IECoreScene/bindings/MeshPrimitiveBuilderBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_MESHPRIMITIVEBUILDERBINDING_H -#define IECORESCENEMODULE_MESHPRIMITIVEBUILDERBINDING_H +#pragma once namespace IECoreSceneModule { void bindMeshPrimitiveBuilder(); } -#endif // IECORESCENEMODULE_MESHPRIMITIVEBUILDERBINDING_H diff --git a/src/IECoreScene/bindings/MeshPrimitiveEvaluatorBinding.h b/src/IECoreScene/bindings/MeshPrimitiveEvaluatorBinding.h index be4d680ff3..24abd5a561 100644 --- a/src/IECoreScene/bindings/MeshPrimitiveEvaluatorBinding.h +++ b/src/IECoreScene/bindings/MeshPrimitiveEvaluatorBinding.h @@ -32,13 +32,11 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_MESHPRIMITIVEEVALUATORBINDING_H -#define IECORESCENEMODULE_MESHPRIMITIVEEVALUATORBINDING_H +#pragma once namespace IECoreSceneModule { void bindMeshPrimitiveEvaluator(); } -#endif // IECORESCENEMODULE_MESHPRIMITIVEEVALUATORBINDING_H diff --git a/src/IECoreScene/bindings/MeshPrimitiveShrinkWrapOpBinding.h b/src/IECoreScene/bindings/MeshPrimitiveShrinkWrapOpBinding.h index a7d737d92f..acd805069b 100644 --- a/src/IECoreScene/bindings/MeshPrimitiveShrinkWrapOpBinding.h +++ b/src/IECoreScene/bindings/MeshPrimitiveShrinkWrapOpBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_MESHPRIMITIVESHRINKWRAPOPBINDING_H -#define IECORESCENEMODULE_MESHPRIMITIVESHRINKWRAPOPBINDING_H +#pragma once namespace IECoreSceneModule { void bindMeshPrimitiveShrinkWrapOp(); } -#endif // IECORESCENEMODULE_MESHPRIMITIVESHRINKWRAPOPBINDING_H diff --git a/src/IECoreScene/bindings/MeshVertexReorderOpBinding.h b/src/IECoreScene/bindings/MeshVertexReorderOpBinding.h index e48730d982..e5c0f891d5 100755 --- a/src/IECoreScene/bindings/MeshVertexReorderOpBinding.h +++ b/src/IECoreScene/bindings/MeshVertexReorderOpBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_MESHVERTEXREORDEROPBINDING_H -#define IECORESCENEMODULE_MESHVERTEXREORDEROPBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindMeshVertexReorderOp(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_MESHVERTEXREORDEROPBINDING_H diff --git a/src/IECoreScene/bindings/NParticleReaderBinding.h b/src/IECoreScene/bindings/NParticleReaderBinding.h index 38dc578aab..2a022b36ac 100644 --- a/src/IECoreScene/bindings/NParticleReaderBinding.h +++ b/src/IECoreScene/bindings/NParticleReaderBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_IFFNPARTICLEREADERBINDING_H -#define IECORESCENEMODULE_IFFNPARTICLEREADERBINDING_H +#pragma once namespace IECoreSceneModule { void bindNParticleReader(); } -#endif // IECORESCENEMODULE_IFFNPARTICLEREADERBINDING_H diff --git a/src/IECoreScene/bindings/NURBSPrimitiveBinding.h b/src/IECoreScene/bindings/NURBSPrimitiveBinding.h index c207990cf0..635b6221e6 100644 --- a/src/IECoreScene/bindings/NURBSPrimitiveBinding.h +++ b/src/IECoreScene/bindings/NURBSPrimitiveBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_NURBSPRIMITIVEBINDING_H -#define IECORESCENEMODULE_NURBSPRIMITIVEBINDING_H +#pragma once namespace IECoreSceneModule { void bindNURBSPrimitive(); } -#endif // IECORESCENEMODULE_NURBSPRIMITIVEBINDING_H diff --git a/src/IECoreScene/bindings/OBJReaderBinding.h b/src/IECoreScene/bindings/OBJReaderBinding.h index 20dc790ed9..48ed4596d2 100644 --- a/src/IECoreScene/bindings/OBJReaderBinding.h +++ b/src/IECoreScene/bindings/OBJReaderBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_OBJREADERBINDING_H -#define IECORESCENEMODULE_OBJREADERBINDING_H +#pragma once namespace IECoreSceneModule { void bindOBJReader(); } -#endif // IECORESCENEMODULE_OBJREADERBINDING_H diff --git a/src/IECoreScene/bindings/OutputBinding.h b/src/IECoreScene/bindings/OutputBinding.h index 9907397e4b..08e3885353 100644 --- a/src/IECoreScene/bindings/OutputBinding.h +++ b/src/IECoreScene/bindings/OutputBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_OUTPUTBINDING_H -#define IECORESCENEMODULE_OUTPUTBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindOutput(); } -#endif // IECORESCENEMODULE_OUTPUTBINDING_H diff --git a/src/IECoreScene/bindings/PDCParticleReaderBinding.h b/src/IECoreScene/bindings/PDCParticleReaderBinding.h index 96f913753b..4372daad91 100644 --- a/src/IECoreScene/bindings/PDCParticleReaderBinding.h +++ b/src/IECoreScene/bindings/PDCParticleReaderBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PDCPARTICLEREADERBINDING_H -#define IECORESCENEMODULE_PDCPARTICLEREADERBINDING_H +#pragma once namespace IECoreSceneModule { void bindPDCParticleReader(); } -#endif // IECORESCENEMODULE_PDCPARTICLEREADERBINDING_H diff --git a/src/IECoreScene/bindings/PDCParticleWriterBinding.h b/src/IECoreScene/bindings/PDCParticleWriterBinding.h index 81b3bdd1b2..93daca6e2b 100644 --- a/src/IECoreScene/bindings/PDCParticleWriterBinding.h +++ b/src/IECoreScene/bindings/PDCParticleWriterBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PDCPARTICLEWRITERBINDING_H -#define IECORESCENEMODULE_PDCPARTICLEWRITERBINDING_H +#pragma once namespace IECoreSceneModule { void bindPDCParticleWriter(); } -#endif // IECORESCENEMODULE_PDCPARTICLEWRITERBINDING_H diff --git a/src/IECoreScene/bindings/ParticleReaderBinding.h b/src/IECoreScene/bindings/ParticleReaderBinding.h index 8450da5f52..2b97a74eb7 100644 --- a/src/IECoreScene/bindings/ParticleReaderBinding.h +++ b/src/IECoreScene/bindings/ParticleReaderBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PARTICLEREADERBINDING_H -#define IECORESCENEMODULE_PARTICLEREADERBINDING_H +#pragma once namespace IECoreSceneModule { void bindParticleReader(); } -#endif // IECORESCENEMODULE_PARTICLEREADERBINDING_H diff --git a/src/IECoreScene/bindings/ParticleWriterBinding.h b/src/IECoreScene/bindings/ParticleWriterBinding.h index bd05b70213..152d9a9ba7 100644 --- a/src/IECoreScene/bindings/ParticleWriterBinding.h +++ b/src/IECoreScene/bindings/ParticleWriterBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PARTICLEWRITERBINDING_H -#define IECORESCENEMODULE_PARTICLEWRITERBINDING_H +#pragma once namespace IECoreSceneModule { void bindParticleWriter(); } -#endif // IECORESCENEMODULE_PARTICLEWRITERBINDING_H diff --git a/src/IECoreScene/bindings/PatchMeshPrimitiveBinding.h b/src/IECoreScene/bindings/PatchMeshPrimitiveBinding.h index 7f26569efb..6eaa79747f 100644 --- a/src/IECoreScene/bindings/PatchMeshPrimitiveBinding.h +++ b/src/IECoreScene/bindings/PatchMeshPrimitiveBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PATCHMESHPRIMITIVEBINDING_H -#define IECORESCENEMODULE_PATCHMESHPRIMITIVEBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindPatchMeshPrimitive(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_PATCHMESHPRIMITIVEBINDING_H diff --git a/src/IECoreScene/bindings/PointsAlgoBinding.h b/src/IECoreScene/bindings/PointsAlgoBinding.h index a9a6d710c5..199c92b619 100644 --- a/src/IECoreScene/bindings/PointsAlgoBinding.h +++ b/src/IECoreScene/bindings/PointsAlgoBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_POINTSALGOBINDING_H -#define IECORESCENEMODULE_POINTSALGOBINDING_H +#pragma once namespace IECoreSceneModule { void bindPointsAlgo(); } -#endif // IECORESCENEMODULE_POINTSALGOBINDING_H diff --git a/src/IECoreScene/bindings/PointsPrimitiveBinding.h b/src/IECoreScene/bindings/PointsPrimitiveBinding.h index b9f0321cbd..d795f4bc7c 100644 --- a/src/IECoreScene/bindings/PointsPrimitiveBinding.h +++ b/src/IECoreScene/bindings/PointsPrimitiveBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_POINTSPRIMITIVEBINDING_H -#define IECORESCENEMODULE_POINTSPRIMITIVEBINDING_H +#pragma once namespace IECoreSceneModule { void bindPointsPrimitive(); } -#endif // IECORESCENEMODULE_POINTSPRIMITIVEBINDING_H diff --git a/src/IECoreScene/bindings/PointsPrimitiveEvaluatorBinding.h b/src/IECoreScene/bindings/PointsPrimitiveEvaluatorBinding.h index 0e38255a91..fbc65c8906 100644 --- a/src/IECoreScene/bindings/PointsPrimitiveEvaluatorBinding.h +++ b/src/IECoreScene/bindings/PointsPrimitiveEvaluatorBinding.h @@ -32,13 +32,11 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_POINTSPRIMITIVEEVALUATORBINDING_H -#define IECORESCENEMODULE_POINTSPRIMITIVEEVALUATORBINDING_H +#pragma once namespace IECoreSceneModule { void bindPointsPrimitiveEvaluator(); } -#endif // IECORESCENEMODULE_POINTSPRIMITIVEEVALUATORBINDING_H diff --git a/src/IECoreScene/bindings/PrimitiveBinding.h b/src/IECoreScene/bindings/PrimitiveBinding.h index f27a7b619f..8b31adeadd 100644 --- a/src/IECoreScene/bindings/PrimitiveBinding.h +++ b/src/IECoreScene/bindings/PrimitiveBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PRIMITIVEBINDING_H -#define IECORESCENEMODULE_PRIMITIVEBINDING_H +#pragma once namespace IECoreSceneModule { void bindPrimitive(); } -#endif // IECORESCENEMODULE_PRIMITIVEBINDING_H diff --git a/src/IECoreScene/bindings/PrimitiveEvaluatorBinding.h b/src/IECoreScene/bindings/PrimitiveEvaluatorBinding.h index 4a7b859592..463a713751 100644 --- a/src/IECoreScene/bindings/PrimitiveEvaluatorBinding.h +++ b/src/IECoreScene/bindings/PrimitiveEvaluatorBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PRIMITIVEEVALUATORBINDING_H -#define IECORESCENEMODULE_PRIMITIVEEVALUATORBINDING_H +#pragma once namespace IECoreSceneModule { void bindPrimitiveEvaluator(); } -#endif // IECORESCENEMODULE_PRIMITIVEEVALUATORBINDING_H diff --git a/src/IECoreScene/bindings/PrimitiveOpBinding.h b/src/IECoreScene/bindings/PrimitiveOpBinding.h index e58e2e1ea7..14d8059f92 100644 --- a/src/IECoreScene/bindings/PrimitiveOpBinding.h +++ b/src/IECoreScene/bindings/PrimitiveOpBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PRIMITIVEOPBINDING_H -#define IECORESCENEMODULE_PRIMITIVEOPBINDING_H +#pragma once namespace IECoreSceneModule { void bindPrimitiveOp(); } -#endif // IECORESCENEMODULE_PRIMITIVEOPBINDING_H diff --git a/src/IECoreScene/bindings/PrimitiveVariableBinding.h b/src/IECoreScene/bindings/PrimitiveVariableBinding.h index ff71cb8ae7..a17bbc7eff 100644 --- a/src/IECoreScene/bindings/PrimitiveVariableBinding.h +++ b/src/IECoreScene/bindings/PrimitiveVariableBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_PRIMITIVEVARIABLEBINDING_H -#define IECORESCENEMODULE_PRIMITIVEVARIABLEBINDING_H +#pragma once namespace IECoreSceneModule { void bindPrimitiveVariable(); } -#endif // IECORESCENEMODULE_PRIMITIVEVARIABLEBINDING_H diff --git a/src/IECoreScene/bindings/RenderableBinding.h b/src/IECoreScene/bindings/RenderableBinding.h index 8144484cd0..bf205ec9d0 100644 --- a/src/IECoreScene/bindings/RenderableBinding.h +++ b/src/IECoreScene/bindings/RenderableBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_RENDERABLEBINDING_H -#define IECORESCENEMODULE_RENDERABLEBINDING_H +#pragma once namespace IECoreSceneModule { void bindRenderable(); } -#endif // IECORESCENEMODULE_RENDERABLEBINDING_H diff --git a/src/IECoreScene/bindings/SampledSceneInterfaceBinding.h b/src/IECoreScene/bindings/SampledSceneInterfaceBinding.h index d0e56d592f..5403c3fdac 100644 --- a/src/IECoreScene/bindings/SampledSceneInterfaceBinding.h +++ b/src/IECoreScene/bindings/SampledSceneInterfaceBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SAMPLEDSCENEINTERFACEBINDING_H -#define IECORESCENEMODULE_SAMPLEDSCENEINTERFACEBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindSampledSceneInterface(); } -#endif // IECORESCENEMODULE_SAMPLEDSCENEINTERFACEBINDING_H diff --git a/src/IECoreScene/bindings/SceneAlgoBinding.h b/src/IECoreScene/bindings/SceneAlgoBinding.h index 587117b0d3..c0b9488dbd 100644 --- a/src/IECoreScene/bindings/SceneAlgoBinding.h +++ b/src/IECoreScene/bindings/SceneAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SCENEALGOBINDING_H -#define IECORESCENEMODULE_SCENEALGOBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindSceneAlgo(); } -#endif // IECORESCENEMODULE_SCENEALGOBINDING_H diff --git a/src/IECoreScene/bindings/SceneCacheBinding.h b/src/IECoreScene/bindings/SceneCacheBinding.h index 2b0a173406..b544ccf294 100644 --- a/src/IECoreScene/bindings/SceneCacheBinding.h +++ b/src/IECoreScene/bindings/SceneCacheBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SCENECACHEBINDING_H -#define IECORESCENEMODULE_SCENECACHEBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindSceneCache(); } -#endif // IECORESCENEMODULE_SCENECACHEBINDING_H diff --git a/src/IECoreScene/bindings/SceneInterfaceBinding.h b/src/IECoreScene/bindings/SceneInterfaceBinding.h index 76c696a50e..9812a351b0 100644 --- a/src/IECoreScene/bindings/SceneInterfaceBinding.h +++ b/src/IECoreScene/bindings/SceneInterfaceBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SCENEINTERFACEBINDING_H -#define IECORESCENEMODULE_SCENEINTERFACEBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindSceneInterface(); } -#endif // IECORESCENEMODULE_SCENEINTERFACEBINDING_H diff --git a/src/IECoreScene/bindings/ShaderBinding.h b/src/IECoreScene/bindings/ShaderBinding.h index 4185ac586f..615025880b 100644 --- a/src/IECoreScene/bindings/ShaderBinding.h +++ b/src/IECoreScene/bindings/ShaderBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SHADERBINDING_H -#define IECORESCENEMODULE_SHADERBINDING_H +#pragma once namespace IECoreSceneModule { void bindShader(); } -#endif // IECORESCENEMODULE_SHADERBINDING_H diff --git a/src/IECoreScene/bindings/ShaderNetworkAlgoBinding.h b/src/IECoreScene/bindings/ShaderNetworkAlgoBinding.h index fb6d62678d..f0dd729b47 100644 --- a/src/IECoreScene/bindings/ShaderNetworkAlgoBinding.h +++ b/src/IECoreScene/bindings/ShaderNetworkAlgoBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SHADERNETWORKALGOBINDING_H -#define IECORESCENEMODULE_SHADERNETWORKALGOBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindShaderNetworkAlgo(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_SHADERNETWORKALGOBINDING_H diff --git a/src/IECoreScene/bindings/ShaderNetworkBinding.h b/src/IECoreScene/bindings/ShaderNetworkBinding.h index 1d3f264318..9dffad64c4 100644 --- a/src/IECoreScene/bindings/ShaderNetworkBinding.h +++ b/src/IECoreScene/bindings/ShaderNetworkBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SHADERNETWORKBINDING_H -#define IECORESCENEMODULE_SHADERNETWORKBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindShaderNetwork(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_SHADERNETWORKBINDING_H diff --git a/src/IECoreScene/bindings/SharedSceneInterfacesBinding.h b/src/IECoreScene/bindings/SharedSceneInterfacesBinding.h index 3b1b085bff..62395d9372 100644 --- a/src/IECoreScene/bindings/SharedSceneInterfacesBinding.h +++ b/src/IECoreScene/bindings/SharedSceneInterfacesBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SHAREDSCENEINTERFACESBINDING_H -#define IECORESCENEMODULE_SHAREDSCENEINTERFACESBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindSharedSceneInterfaces(); } -#endif // IECORESCENEMODULE_SHAREDSCENEINTERFACESBINDING_H diff --git a/src/IECoreScene/bindings/SpherePrimitiveBinding.h b/src/IECoreScene/bindings/SpherePrimitiveBinding.h index 3f1828f496..268d4c67cc 100644 --- a/src/IECoreScene/bindings/SpherePrimitiveBinding.h +++ b/src/IECoreScene/bindings/SpherePrimitiveBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SPHEREPRIMITIVEBINDING_H -#define IECORESCENEMODULE_SPHEREPRIMITIVEBINDING_H +#pragma once namespace IECoreSceneModule { void bindSpherePrimitive(); } -#endif // IECORESCENEMODULE_SPHEREPRIMITIVEBINDING_H diff --git a/src/IECoreScene/bindings/SpherePrimitiveEvaluatorBinding.h b/src/IECoreScene/bindings/SpherePrimitiveEvaluatorBinding.h index 3ab0a51493..dac2ab45be 100644 --- a/src/IECoreScene/bindings/SpherePrimitiveEvaluatorBinding.h +++ b/src/IECoreScene/bindings/SpherePrimitiveEvaluatorBinding.h @@ -32,13 +32,11 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_SPHEREPRIMITIVEEVALUATORBINDING_H -#define IECORESCENEMODULE_SPHEREPRIMITIVEEVALUATORBINDING_H +#pragma once namespace IECoreSceneModule { void bindSpherePrimitiveEvaluator(); } -#endif // IECORESCENEMODULE_SPHEREPRIMITIVEEVALUATORBINDING_H diff --git a/src/IECoreScene/bindings/TransformOpBinding.h b/src/IECoreScene/bindings/TransformOpBinding.h index 0ff816198f..b8b796677f 100644 --- a/src/IECoreScene/bindings/TransformOpBinding.h +++ b/src/IECoreScene/bindings/TransformOpBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_TRANSFORMOPBINDING_H -#define IECORESCENEMODULE_TRANSFORMOPBINDING_H +#pragma once namespace IECoreSceneModule { void bindTransformOp(); } -#endif // IECORESCENEMODULE_TRANSFORMOPBINDING_H diff --git a/src/IECoreScene/bindings/TriangulateOpBinding.h b/src/IECoreScene/bindings/TriangulateOpBinding.h index ebeb393c27..7bcb2f58dd 100644 --- a/src/IECoreScene/bindings/TriangulateOpBinding.h +++ b/src/IECoreScene/bindings/TriangulateOpBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_TRIANGULATEOPBINDING_H -#define IECORESCENEMODULE_TRIANGULATEOPBINDING_H +#pragma once namespace IECoreSceneModule { void bindTriangulateOp(); } -#endif // IECORESCENEMODULE_TRIANGULATEOPBINDING_H diff --git a/src/IECoreScene/bindings/TriangulatorBinding.h b/src/IECoreScene/bindings/TriangulatorBinding.h index 6ed6550b7f..d94d6af9a8 100644 --- a/src/IECoreScene/bindings/TriangulatorBinding.h +++ b/src/IECoreScene/bindings/TriangulatorBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_TRIANGULATORBINDING_H -#define IECORESCENEMODULE_TRIANGULATORBINDING_H +#pragma once namespace IECoreSceneModule { void bindTriangulator(); } -#endif // IECORESCENEMODULE_TRIANGULATORBINDING_H diff --git a/src/IECoreScene/bindings/TypeIdBinding.h b/src/IECoreScene/bindings/TypeIdBinding.h index fb4ccb2f42..80d285685b 100644 --- a/src/IECoreScene/bindings/TypeIdBinding.h +++ b/src/IECoreScene/bindings/TypeIdBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_TYPEIDBINDING_H -#define IECORESCENEMODULE_TYPEIDBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindTypeId(); } -#endif // IECORESCENEMODULE_TYPEIDBINDING_H diff --git a/src/IECoreScene/bindings/TypedObjectParameterBinding.h b/src/IECoreScene/bindings/TypedObjectParameterBinding.h index 982c23c091..92ae0a7e2f 100644 --- a/src/IECoreScene/bindings/TypedObjectParameterBinding.h +++ b/src/IECoreScene/bindings/TypedObjectParameterBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_TYPEDOBJECTPARAMETERBINDING_H -#define IECORESCENEMODULE_TYPEDOBJECTPARAMETERBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindTypedObjectParameter(); } // namespace IECoreSceneModule -#endif // IECORESCENEMODULE_TYPEDOBJECTPARAMETERBINDING_H diff --git a/src/IECoreScene/bindings/TypedPrimitiveOpBinding.h b/src/IECoreScene/bindings/TypedPrimitiveOpBinding.h index e4bca02e5b..0e9928696a 100644 --- a/src/IECoreScene/bindings/TypedPrimitiveOpBinding.h +++ b/src/IECoreScene/bindings/TypedPrimitiveOpBinding.h @@ -32,12 +32,10 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_TYPEDPRIMITIVEOPBINDING_H -#define IECORESCENEMODULE_TYPEDPRIMITIVEOPBINDING_H +#pragma once namespace IECoreSceneModule { void bindTypedPrimitiveOp(); } -#endif // IECORESCENEMODULE_TYPEDPRIMITIVEOPBINDING_H diff --git a/src/IECoreScene/bindings/VisibleRenderableBinding.h b/src/IECoreScene/bindings/VisibleRenderableBinding.h index b9e5afda13..f15f85f066 100644 --- a/src/IECoreScene/bindings/VisibleRenderableBinding.h +++ b/src/IECoreScene/bindings/VisibleRenderableBinding.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORESCENEMODULE_VISIBLERENDERABLEBINDING_H -#define IECORESCENEMODULE_VISIBLERENDERABLEBINDING_H +#pragma once namespace IECoreSceneModule { @@ -42,4 +41,3 @@ void bindVisibleRenderable(); } -#endif // IECORESCENEMODULE_VISIBLERENDERABLEBINDING_H diff --git a/test/IECore/BoostUnitTestTest.h b/test/IECore/BoostUnitTestTest.h index 675a6989ac..f315ece62a 100644 --- a/test/IECore/BoostUnitTestTest.h +++ b/test/IECore/BoostUnitTestTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_BOOSTUNITTESTTEST_H -#define IE_CORE_BOOSTUNITTESTTEST_H +#pragma once #include "IECore/Export.h" @@ -89,5 +88,3 @@ struct BoostUnitTestTestSuite : public boost::unit_test::test_suite } -#endif - diff --git a/test/IECore/CompilerTest.h b/test/IECore/CompilerTest.h index 998f731389..383b480daa 100644 --- a/test/IECore/CompilerTest.h +++ b/test/IECore/CompilerTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_COMPILERTEST_H -#define IE_CORE_COMPILERTEST_H +#pragma once #include "IECore/BoxOps.h" #include "IECore/Export.h" @@ -99,5 +98,3 @@ struct CompilerTestSuite : public boost::unit_test::test_suite } -#endif - diff --git a/test/IECore/CompoundDataTest.h b/test/IECore/CompoundDataTest.h index 8d22515cd9..87ddf8c8c0 100644 --- a/test/IECore/CompoundDataTest.h +++ b/test/IECore/CompoundDataTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_COMPOUNDDATATEST_H -#define IECORE_COMPOUNDDATATEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addCompoundDataTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_COMPOUNDDATATEST_H diff --git a/test/IECore/CompoundObjectTest.h b/test/IECore/CompoundObjectTest.h index 6c22c330ad..0af1b01aa5 100644 --- a/test/IECore/CompoundObjectTest.h +++ b/test/IECore/CompoundObjectTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_COMPOUNDOBJECTTEST_H -#define IECORE_COMPOUNDOBJECTTEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addCompoundObjectTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_COMPOUNDOBJECTTEST_H diff --git a/test/IECore/ComputationCacheTest.h b/test/IECore/ComputationCacheTest.h index ef2da8aa95..52ece09e95 100644 --- a/test/IECore/ComputationCacheTest.h +++ b/test/IECore/ComputationCacheTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_COMPUTATIONCACHETEST_H -#define IECORE_COMPUTATIONCACHETEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,3 @@ void addComputationCacheTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_COMPUTATIONCACHETEST_H - diff --git a/test/IECore/DataConversionTest.h b/test/IECore/DataConversionTest.h index ec5ed4a3ed..9d99789b52 100644 --- a/test/IECore/DataConversionTest.h +++ b/test/IECore/DataConversionTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DATACONVERSIONTEST_H -#define IE_CORE_DATACONVERSIONTEST_H +#pragma once #include "IECore/CompoundDataConversion.h" #include "IECore/Export.h" @@ -171,5 +170,4 @@ struct DataConversionTestSuite : public boost::unit_test::test_suite } -#endif // IE_CORE_DATACONVERSIONTEST_H diff --git a/test/IECore/DataConvertTest.h b/test/IECore/DataConvertTest.h index 0e4d06d9b9..8bb0f6eb73 100644 --- a/test/IECore/DataConvertTest.h +++ b/test/IECore/DataConvertTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DATACONVERTTEST_H -#define IE_CORE_DATACONVERTTEST_H +#pragma once #include "IECore/DataConversion.h" #include "IECore/DataConvert.h" @@ -144,5 +143,4 @@ struct DataConvertTestSuite : public boost::unit_test::test_suite } -#endif // IE_CORE_DATACONVERTTEST_H diff --git a/test/IECore/DespatchTypedDataTest.h b/test/IECore/DespatchTypedDataTest.h index 1e2d0ba638..23dbafbf8e 100644 --- a/test/IECore/DespatchTypedDataTest.h +++ b/test/IECore/DespatchTypedDataTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_DESPATCHTYPEDDATATEST_H -#define IE_CORE_DESPATCHTYPEDDATATEST_H +#pragma once #include "IECore/DespatchTypedData.h" #include "IECore/Export.h" @@ -114,5 +113,4 @@ struct DespatchTypedDataTestSuite : public boost::unit_test::test_suite } -#endif // IE_CORE_DESPATCHTYPEDDATATEST_H diff --git a/test/IECore/IndexedIOTest.h b/test/IECore/IndexedIOTest.h index e9293da541..5627732b1b 100755 --- a/test/IECore/IndexedIOTest.h +++ b/test/IECore/IndexedIOTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_INDEXEDIOTEST_H -#define IE_CORE_INDEXEDIOTEST_H +#pragma once #include "IECore/Export.h" #include "IECore/IECore.h" @@ -259,6 +258,3 @@ struct IndexedIOTestSuite : public boost::unit_test::test_suite }; } - -#endif - diff --git a/test/IECore/InternedStringTest.h b/test/IECore/InternedStringTest.h index 587859a5cd..077a21c45d 100644 --- a/test/IECore/InternedStringTest.h +++ b/test/IECore/InternedStringTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_INTERNEDSTRINGTEST_H -#define IECORE_INTERNEDSTRINGTEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addInternedStringTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_INTERNEDSTRINGTEST_H diff --git a/test/IECore/InterpolatorTest.h b/test/IECore/InterpolatorTest.h index b25e50977e..aded7cf8c9 100644 --- a/test/IECore/InterpolatorTest.h +++ b/test/IECore/InterpolatorTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_INTERPOLATORTEST_H -#define IE_CORE_INTERPOLATORTEST_H +#pragma once #include "IECore/Export.h" #include "IECore/Interpolator.h" @@ -195,5 +194,3 @@ struct InterpolatorTestSuite : public boost::unit_test::test_suite #include "InterpolatorTest.inl" -#endif - diff --git a/test/IECore/KDTreeTest.h b/test/IECore/KDTreeTest.h index 0af7b5dff6..8eba347420 100644 --- a/test/IECore/KDTreeTest.h +++ b/test/IECore/KDTreeTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_KDTREETEST_H -#define IE_CORE_KDTREETEST_H +#pragma once #include "IECore/Export.h" #include "IECore/KDTree.h" @@ -119,4 +118,3 @@ struct KDTreeTestSuite : public boost::unit_test::test_suite #include "KDTreeTest.inl" -#endif // IE_CORE_KDTREETEST_H diff --git a/test/IECore/LRUCacheThreadingTest.h b/test/IECore/LRUCacheThreadingTest.h index ff08eacab3..548284b9b7 100644 --- a/test/IECore/LRUCacheThreadingTest.h +++ b/test/IECore/LRUCacheThreadingTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LRUCACHETHREADINGTEST_H -#define IECORE_LRUCACHETHREADINGTEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addLRUCacheThreadingTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_LRUCACHETHREADINGTEST_H diff --git a/test/IECore/LevenbergMarquardtTest.h b/test/IECore/LevenbergMarquardtTest.h index a901488730..5d8554d823 100644 --- a/test/IECore/LevenbergMarquardtTest.h +++ b/test/IECore/LevenbergMarquardtTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_LEVENBERGMARQUARDTTEST_H -#define IE_CORE_LEVENBERGMARQUARDTTEST_H +#pragma once #include "IECore/Export.h" #include "IECore/LevenbergMarquardt.h" @@ -128,4 +127,3 @@ struct LevenbergMarquardtTestSuite : public boost::unit_test::test_suite #include "LevenbergMarquardtTest.inl" -#endif // IECORE_LEVENBERGMARQUARDTTEST_H diff --git a/test/IECore/LookupTest.h b/test/IECore/LookupTest.h index 8d4dde18e4..5599e1d203 100644 --- a/test/IECore/LookupTest.h +++ b/test/IECore/LookupTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_LOOKUPTEST_H -#define IECORE_LOOKUPTEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addLookupTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_LOOKUPTEST_H diff --git a/test/IECore/MurmurHashTest.h b/test/IECore/MurmurHashTest.h index 13395d5359..6dc25c6cc2 100644 --- a/test/IECore/MurmurHashTest.h +++ b/test/IECore/MurmurHashTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_MURMURHASHTEST_H -#define IECORE_MURMURHASHTEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addMurmurHashTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_MURMURHASHTEST_H diff --git a/test/IECore/ParameterThreadingTest.h b/test/IECore/ParameterThreadingTest.h index b5a07e33e7..fa24263ee6 100644 --- a/test/IECore/ParameterThreadingTest.h +++ b/test/IECore/ParameterThreadingTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_PARAMETERTHREADINGTEST_H -#define IECORE_PARAMETERTHREADINGTEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addParameterThreadingTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_PARAMETERTHREADINGTEST_H diff --git a/test/IECore/RefCountedThreadingTest.h b/test/IECore/RefCountedThreadingTest.h index 7feba6f0f5..89983d3b07 100644 --- a/test/IECore/RefCountedThreadingTest.h +++ b/test/IECore/RefCountedThreadingTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_REFCOUNTEDTHREADINGTEST_H -#define IECORE_REFCOUNTEDTHREADINGTEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addRefCountedThreadingTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_REFCOUNTEDTHREADINGTEST_H diff --git a/test/IECore/SpaceTransformTest.h b/test/IECore/SpaceTransformTest.h index 781019f62a..b98a3aa094 100644 --- a/test/IECore/SpaceTransformTest.h +++ b/test/IECore/SpaceTransformTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_SPACETRANSFORMTEST_H -#define IE_CORE_SPACETRANSFORMTEST_H +#pragma once #include "IECore/EuclideanToSphericalTransform.h" #include "IECore/Export.h" @@ -130,5 +129,4 @@ struct SpaceTransformTestSuite : public boost::unit_test::test_suite } -#endif // IE_CORE_SPACETRANSFORMTEST_H diff --git a/test/IECore/StringAlgoTest.h b/test/IECore/StringAlgoTest.h index f2ac3cc217..d7e3b88a88 100644 --- a/test/IECore/StringAlgoTest.h +++ b/test/IECore/StringAlgoTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IECORE_STRINGALGOTEST_H -#define IECORE_STRINGALGOTEST_H +#pragma once #include "IECore/Export.h" @@ -48,5 +47,4 @@ void addStringAlgoTest( boost::unit_test::test_suite *test ); } -#endif // IECORE_STRINGALGOTEST_H diff --git a/test/IECore/TypedDataTest.h b/test/IECore/TypedDataTest.h index e2ba63b513..418e1df413 100644 --- a/test/IECore/TypedDataTest.h +++ b/test/IECore/TypedDataTest.h @@ -32,8 +32,7 @@ // ////////////////////////////////////////////////////////////////////////// -#ifndef IE_CORE_TYPEDDATATEST_H -#define IE_CORE_TYPEDDATATEST_H +#pragma once #include "IECore/Export.h" #include "IECore/SimpleTypedData.h" @@ -163,4 +162,3 @@ struct TypedDataTestSuite : public boost::unit_test::test_suite #include "TypedDataTest.inl" -#endif // IE_CORE_TYPEDDATATEST_H