[cig-commits] commit:

[Mercurial]

changeset:   129:4de4ce2a5947
user:        LukeHodkinson
date:        Mon Aug 04 16:28:35 2008 +0000
files:       Shape/src/ShapeClass.h
description:
Adding some useful cpp definitions to help with
inheritance.


diff -r d2c33297f251 -r 4de4ce2a5947 Shape/src/ShapeClass.h
--- a/Shape/src/ShapeClass.h	Mon Aug 04 16:27:52 2008 +0000
+++ b/Shape/src/ShapeClass.h	Mon Aug 04 16:28:35 2008 +0000
@@ -69,22 +69,40 @@
 	/*---------------------------------------------------------------------------------------------------------------------
 	** Constructors
 	*/
-	Stg_Shape* _Stg_Shape_New(
-		SizeT                                       _sizeOfSelf, 
-		Type                                        type,
-		Stg_Class_DeleteFunction*                   _delete,
-		Stg_Class_PrintFunction*                    _print,
-		Stg_Class_CopyFunction*                     _copy, 
-		Stg_Component_DefaultConstructorFunction*   _defaultConstructor,
-		Stg_Component_ConstructFunction*            _construct,
-		Stg_Component_BuildFunction*                _build,
-		Stg_Component_InitialiseFunction*           _initialise,
-		Stg_Component_ExecuteFunction*              _execute,
-		Stg_Component_DestroyFunction*              _destroy,
-		Stg_Shape_IsCoordInsideFunction*            _isCoordInside,
-		Stg_Shape_CalculateVolumeFunction*          _calculateVolume,
-		Stg_Shape_DistanceFromCenterAxisFunction*   _distanceFromCenterAxis,
-		Name                                        name );
+
+#define STG_SHAPE_ARGS\
+   SizeT                                       _sizeOfSelf, \
+      Type                                        type,\
+      Stg_Class_DeleteFunction*                   _delete,\
+      Stg_Class_PrintFunction*                    _print,\
+      Stg_Class_CopyFunction*                     _copy, \
+      Stg_Component_DefaultConstructorFunction*   _defaultConstructor,\
+      Stg_Component_ConstructFunction*            _construct,\
+      Stg_Component_BuildFunction*                _build,\
+      Stg_Component_InitialiseFunction*           _initialise,\
+      Stg_Component_ExecuteFunction*              _execute,\
+      Stg_Component_DestroyFunction*              _destroy,\
+      Stg_Shape_IsCoordInsideFunction*            _isCoordInside,\
+      Stg_Shape_CalculateVolumeFunction*          _calculateVolume,\
+      Stg_Shape_DistanceFromCenterAxisFunction*   _distanceFromCenterAxis,\
+      Name                                        name
+
+#define STG_SHAPE_PASSARGS \
+   _sizeOfSelf,\
+      type,\
+      _delete,\
+      _print,\
+      _copy,\
+      _defaultConstructor,\
+      _construct,\
+      _build, \
+      _initialise,\
+      _execute,\
+      _destroy, \
+      _isCoordInside, _calculateVolume, _distanceFromCenterAxis, \
+      name
+
+Stg_Shape* _Stg_Shape_New( STG_SHAPE_ARGS );
 	
 	void _Stg_Shape_Init( void* shape, Dimension_Index dim, Coord centre, Bool invert, double alpha, double beta, double gamma ) ;
 	void Stg_Shape_InitAll( void* shape, Dimension_Index dim, Coord centre, double alpha, double beta, double gamma );