Skip to content

Commit 07d552e

Browse files
andrewkaufmanandrewkaufman
committed
IECoreHoudini : Fix include order
1 parent b633d89 commit 07d552e

File tree

102 files changed

+544
-537
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+544
-537
lines changed

‎include/IECoreHoudini/Convert.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,21 @@
3737

3838
#include "IECore/Convert.h"
3939
#include "IECore/Data.h"
40+
#include "IECore/Export.h"
4041

41-
#include "OpenEXR/ImathColor.h"
42-
#include "OpenEXR/ImathVec.h"
42+
IECORE_PUSH_DEFAULT_VISIBILITY
4343
#include "OpenEXR/ImathBox.h"
44-
#include "OpenEXR/ImathQuat.h"
45-
#include "OpenEXR/ImathMatrix.h"
44+
#include "OpenEXR/ImathColor.h"
4645
#include "OpenEXR/ImathEuler.h"
46+
#include "OpenEXR/ImathMatrix.h"
47+
#include "OpenEXR/ImathQuat.h"
48+
#include "OpenEXR/ImathVec.h"
49+
IECORE_POP_DEFAULT_VISIBILITY
4750

51+
#include "UT/UT_BoundingBox.h"
4852
#include "UT/UT_Color.h"
4953
#include "UT/UT_Matrix4.h"
5054
#include "UT/UT_Vector3.h"
51-
#include "UT/UT_BoundingBox.h"
5255

5356
#include <string>
5457

‎include/IECoreHoudini/CoreHoudini.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
#ifndef IECOREHOUDINI_COREHOUDINI_H
3939
#define IECOREHOUDINI_COREHOUDINI_H
4040

41-
#include <string>
42-
#include <vector>
43-
4441
// \todo: libIECoreHoudini should not use python. Move any use case to the IECoreHoudini bindings
4542
#include "boost/python.hpp"
4643

44+
#include "IECore/Object.h"
45+
4746
#include "GU/GU_DetailHandle.h"
4847

49-
#include "IECore/Object.h"
48+
#include <string>
49+
#include <vector>
5050

5151
/// The IECoreHoudini namespace holds all the functionality of libIECoreHoudini.
5252
namespace IECoreHoudini

‎include/IECoreHoudini/FnParameterisedHolder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
#ifndef IECOREHOUDINI_FNPARAMETERISEDHOLDER_H
3939
#define IECOREHOUDINI_FNPARAMETERISEDHOLDER_H
4040

41-
#include "OP/OP_Node.h"
42-
4341
#include "IECoreHoudini/NodeHandle.h"
4442
#include "IECoreHoudini/ParameterisedHolderInterface.h"
4543

44+
#include "OP/OP_Node.h"
45+
4646
namespace IECoreHoudini
4747
{
4848

‎include/IECoreHoudini/FromHoudiniCompoundObjectConverter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IECOREHOUDINI_FROMHOUDINICOMPOUNDOBJECTCONVERTER_H
3636
#define IECOREHOUDINI_FROMHOUDINICOMPOUNDOBJECTCONVERTER_H
3737

38-
#include "IECore/Object.h"
39-
40-
#include "IECoreHoudini/TypeIds.h"
4138
#include "IECoreHoudini/FromHoudiniGeometryConverter.h"
39+
#include "IECoreHoudini/TypeIds.h"
40+
41+
#include "IECore/Object.h"
4242

4343
namespace IECoreHoudini
4444
{

‎include/IECoreHoudini/FromHoudiniConverter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IE_COREHOUDINI_FROMHOUDINICONVERTER_H
3636
#define IE_COREHOUDINI_FROMHOUDINICONVERTER_H
3737

38-
#include "IECore/ToCoreConverter.h"
39-
4038
#include "IECoreHoudini/TypeIds.h"
4139

40+
#include "IECore/ToCoreConverter.h"
41+
4242
namespace IECoreHoudini
4343
{
4444

‎include/IECoreHoudini/FromHoudiniCortexObjectConverter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IECOREHOUDINI_FROMHOUDINICORTEXOBJECTCONVERTER_H
3636
#define IECOREHOUDINI_FROMHOUDINICORTEXOBJECTCONVERTER_H
3737

38-
#include "IECore/Object.h"
39-
40-
#include "IECoreHoudini/TypeIds.h"
4138
#include "IECoreHoudini/FromHoudiniGeometryConverter.h"
39+
#include "IECoreHoudini/TypeIds.h"
40+
41+
#include "IECore/Object.h"
4242

4343
namespace IECoreHoudini
4444
{

‎include/IECoreHoudini/FromHoudiniCurvesConverter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IECOREHOUDINI_FROMHOUDINICURVESCONVERTER_H
3636
#define IECOREHOUDINI_FROMHOUDINICURVESCONVERTER_H
3737

38-
#include "IECoreScene/CurvesPrimitive.h"
39-
40-
#include "IECoreHoudini/TypeIds.h"
4138
#include "IECoreHoudini/FromHoudiniGeometryConverter.h"
39+
#include "IECoreHoudini/TypeIds.h"
40+
41+
#include "IECoreScene/CurvesPrimitive.h"
4242

4343
namespace IECoreHoudini
4444
{

‎include/IECoreHoudini/FromHoudiniGeometryConverter.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@
3838
#ifndef IECOREHOUDINI_FROMHOUDINIGEOMETRYCONVERTER_H
3939
#define IECOREHOUDINI_FROMHOUDINIGEOMETRYCONVERTER_H
4040

41-
#include "GA/GA_AttributeRef.h"
42-
#include "GU/GU_Detail.h"
43-
#include "GU/GU_DetailHandle.h"
44-
#include "SOP/SOP_Node.h"
45-
#include "UT/UT_StringMMPattern.h"
41+
#include "IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h"
4642

47-
#include "IECore/SimpleTypedData.h"
48-
#include "IECore/SimpleTypedParameter.h"
49-
#include "IECore/VectorTypedData.h"
50-
#include "IECore/InternedString.h"
43+
#include "IECoreHoudini/FromHoudiniConverter.h"
44+
#include "IECoreHoudini/TypeIds.h"
5145

5246
#include "IECoreScene/Primitive.h"
5347

54-
#include "IECoreHoudini/TypeIds.h"
55-
#include "IECoreHoudini/FromHoudiniConverter.h"
48+
#include "IECore/InternedString.h"
49+
#include "IECore/SimpleTypedData.h"
50+
#include "IECore/SimpleTypedParameter.h"
51+
#include "IECore/VectorTypedData.h"
5652

57-
#include "IECoreHoudini/bindings/FromHoudiniGeometryConverterBinding.h" // to enable friend declaration for bindFromHoudiniGeometryConverter()
53+
#include "GA/GA_AttributeRef.h"
54+
#include "GU/GU_Detail.h"
55+
#include "GU/GU_DetailHandle.h"
56+
#include "SOP/SOP_Node.h"
57+
#include "UT/UT_StringMMPattern.h"
5858

5959
namespace IECoreHoudini
6060
{

‎include/IECoreHoudini/FromHoudiniGeometryConverter.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
#ifndef IECOREHOUDINI_FROMHOUDINIGEOMETRYCONVERTER_INL
3636
#define IECOREHOUDINI_FROMHOUDINIGEOMETRYCONVERTER_INL
3737

38-
#include "GEO/GEO_Vertex.h"
38+
#include "IECoreHoudini/FromHoudiniGeometryConverter.h"
3939

4040
#include "IECore/DespatchTypedData.h"
4141
#include "IECore/VectorTraits.h"
4242

43-
#include "IECoreHoudini/FromHoudiniGeometryConverter.h"
43+
#include "GEO/GEO_Vertex.h"
4444

4545
namespace IECoreHoudini
4646
{

‎include/IECoreHoudini/FromHoudiniPointsConverter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IE_COREHOUDINI_FROMHOUDINIPOINTSCONVERTER_H
3636
#define IE_COREHOUDINI_FROMHOUDINIPOINTSCONVERTER_H
3737

38-
#include "IECoreScene/PointsPrimitive.h"
39-
40-
#include "IECoreHoudini/TypeIds.h"
4138
#include "IECoreHoudini/FromHoudiniGeometryConverter.h"
39+
#include "IECoreHoudini/TypeIds.h"
40+
41+
#include "IECoreScene/PointsPrimitive.h"
4242

4343
namespace IECoreHoudini
4444
{

‎include/IECoreHoudini/FromHoudiniPolygonsConverter.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IE_COREHOUDINI_FROMHOUDINIPOLYGONSCONVERTER_H
3636
#define IE_COREHOUDINI_FROMHOUDINIPOLYGONSCONVERTER_H
3737

38-
#include "IECoreScene/MeshPrimitive.h"
39-
40-
#include "IECoreHoudini/TypeIds.h"
4138
#include "IECoreHoudini/FromHoudiniGeometryConverter.h"
39+
#include "IECoreHoudini/TypeIds.h"
40+
41+
#include "IECoreScene/MeshPrimitive.h"
4242

4343
namespace IECoreHoudini
4444
{

‎include/IECoreHoudini/GEO_CobIOTranslator.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
#ifndef IECOREHOUDINI_GEOCOBIOTRANSLATOR_H
3636
#define IECOREHOUDINI_GEOCOBIOTRANSLATOR_H
3737

38-
#include <ostream>
39-
38+
#include "GA/GA_Stat.h"
4039
#include "GEO/GEO_IOTranslator.h"
4140
#include "GU/GU_Detail.h"
4241
#include "UT/UT_IStream.h"
43-
#include "GA/GA_Stat.h"
42+
43+
#include <ostream>
4444

4545
namespace IECoreHoudini
4646
{

‎include/IECoreHoudini/GEO_CortexPrimitive.h

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,17 @@
3535
#ifndef IECOREHOUDINI_GEOCORTEXPRIMITIVE_H
3636
#define IECOREHOUDINI_GEOCORTEXPRIMITIVE_H
3737

38+
#include "IECoreHoudini/CoreHoudiniVersion.h"
39+
40+
#include "IECore/Object.h"
41+
3842
#include "GA/GA_Defines.h"
3943
#include "GA/GA_LoadMap.h"
44+
#include "GA/GA_Primitive.h"
45+
#include "GEO/GEO_Point.h"
4046
#include "GEO/GEO_Primitive.h"
4147
#include "GU/GU_Detail.h"
42-
#include "GEO/GEO_Point.h"
43-
#include "OP/OP_Context.h"
44-
#include "OP/OP_NodeInfoParms.h"
45-
#include "UT/UT_Version.h"
46-
#include "UT/UT_ParallelUtil.h"
47-
#include "GA/GA_Primitive.h"
48+
4849
#if UT_MAJOR_VERSION_INT >= 14
4950

5051
typedef GEO_ConvertParms ConvertParms;
@@ -58,8 +59,11 @@ typedef GU_ConvertParms ConvertParms;
5859

5960
#endif
6061

61-
#include "IECoreHoudini/CoreHoudiniVersion.h"
62-
#include "IECore/Object.h"
62+
63+
#include "OP/OP_Context.h"
64+
#include "OP/OP_NodeInfoParms.h"
65+
#include "UT/UT_ParallelUtil.h"
66+
#include "UT/UT_Version.h"
6367

6468
namespace IECoreHoudini
6569
{

‎include/IECoreHoudini/GR_CortexPrimitive.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,14 @@
3232
//
3333
//////////////////////////////////////////////////////////////////////////
3434

35-
/// GR_Primitives are used in Houdini 12.5, but do not exist in earlier versions.
36-
/// Check GR_Cortex.h for Cortex viewport rendering in Houdini 12.0.
37-
#include "UT/UT_Version.h"
38-
#if UT_MAJOR_VERSION_INT > 12 || UT_MINOR_VERSION_INT >= 5
39-
4035
#ifndef IECOREHOUDINI_GRCORTEXPRIMITIVE_H
4136
#define IECOREHOUDINI_GRCORTEXPRIMITIVE_H
4237

43-
#include "GR/GR_Primitive.h"
44-
4538
#include "IECoreScene/Renderable.h"
4639

40+
#include "GR/GR_Primitive.h"
41+
#include "UT/UT_Version.h"
42+
4743
// We can't include any IECoreGL files here, because it
4844
// causes an issue with gl/glew initialization order.
4945
namespace IECoreGL
@@ -118,5 +114,3 @@ class GR_CortexPrimitive : public GR_Primitive
118114
} // namespace IECoreHoudini
119115

120116
#endif // IECOREHOUDINI_GRCORTEXPRIMITIVE_H
121-
122-
#endif // 12.5 or later

‎include/IECoreHoudini/GUI_CortexPrimitiveHook.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
//
3333
//////////////////////////////////////////////////////////////////////////
3434

35-
/// GUI_PrimitiveHooks are used in Houdini 12.5, but do not exist in earlier versions.
36-
/// Check GR_Cortex.h for Cortex viewport rendering in Houdini 12.0.
37-
#include "UT/UT_Version.h"
38-
#if UT_MAJOR_VERSION_INT > 12 || UT_MINOR_VERSION_INT >= 5
39-
4035
#ifndef IECOREHOUDINI_GUICORTEXPRIMITIVEHOOK_H
4136
#define IECOREHOUDINI_GUICORTEXPRIMITIVEHOOK_H
4237

@@ -60,6 +55,3 @@ class GUI_CortexPrimitiveHook : public GUI_PrimitiveHook
6055
} // namespace IECoreHoudini
6156

6257
#endif // IECOREHOUDINI_GUICORTEXPRIMITIVEHOOK_H
63-
64-
#endif // 12.5 or later
65-

‎include/IECoreHoudini/GU_CortexPrimitive.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,19 @@
3333
//////////////////////////////////////////////////////////////////////////
3434

3535
#include "UT/UT_Version.h"
36-
3736
#if UT_MAJOR_VERSION_INT < 14
3837

3938
#ifndef IECOREHOUDINI_GUCORTEXPRIMITIVE_H
4039
#define IECOREHOUDINI_GUCORTEXPRIMITIVE_H
4140

42-
#include "GU/GU_Prim.h"
43-
#include "GU/GU_Detail.h"
44-
#include "OP/OP_Context.h"
45-
#include "OP/OP_NodeInfoParms.h"
41+
#include "IECoreHoudini/GEO_CortexPrimitive.h"
4642

4743
#include "IECore/Object.h"
4844

49-
#include "IECoreHoudini/GEO_CortexPrimitive.h"
45+
#include "GU/GU_Detail.h"
46+
#include "GU/GU_Prim.h"
47+
#include "OP/OP_Context.h"
48+
#include "OP/OP_NodeInfoParms.h"
5049

5150
namespace IECoreHoudini
5251
{

‎include/IECoreHoudini/LiveScene.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
#ifndef IECOREHOUDINI_LIVESCENE_H
3636
#define IECOREHOUDINI_LIVESCENE_H
3737

38-
#include "boost/shared_ptr.hpp"
39-
#include "boost/function.hpp"
38+
#include "IECoreHoudini/DetailSplitter.h"
39+
#include "IECoreHoudini/TypeIds.h"
40+
41+
#include "IECoreScene/SceneInterface.h"
4042

4143
#include "OP/OP_Node.h"
4244
#include "UT/UT_String.h"
4345

44-
#include "IECoreScene/SceneInterface.h"
45-
46-
#include "IECoreHoudini/DetailSplitter.h"
47-
#include "IECoreHoudini/TypeIds.h"
46+
#include "boost/function.hpp"
47+
#include "boost/shared_ptr.hpp"
4848

4949
namespace IECoreHoudini
5050
{

‎include/IECoreHoudini/MessageHandler.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IECOREHOUDINI_MESSAGEHANDLER_H
3636
#define IECOREHOUDINI_MESSAGEHANDLER_H
3737

38-
#include "boost/function.hpp"
39-
4038
#include "IECore/MessageHandler.h"
4139

40+
#include "boost/function.hpp"
41+
4242
namespace IECoreHoudini
4343
{
4444

‎include/IECoreHoudini/NodeHandle.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IE_COREHOUDINI_NODEHANDLE_H
3636
#define IE_COREHOUDINI_NODEHANDLE_H
3737

38-
#include "boost/shared_ptr.hpp"
39-
40-
#include "OP/OP_Node.h"
4138
#include "HOM/HOM_Node.h"
39+
#include "OP/OP_Node.h"
40+
41+
#include "boost/shared_ptr.hpp"
4242

4343
namespace IECoreHoudini
4444
{

‎include/IECoreHoudini/OBJ_SceneCacheGeometry.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#ifndef IECOREHOUDINI_OBJSCENECACHEGEOMETRY_H
3636
#define IECOREHOUDINI_OBJSCENECACHEGEOMETRY_H
3737

38-
#include "OBJ/OBJ_Geometry.h"
39-
4038
#include "IECoreHoudini/OBJ_SceneCacheNode.h"
4139

40+
#include "OBJ/OBJ_Geometry.h"
41+
4242
namespace IECoreHoudini
4343
{
4444

0 commit comments

Comments
 (0)