[cig-commits] r6585 - in long/3D/Gale/trunk: . src/StGermain/Base/Foundation/src src/StGermain/Discretisation/Mesh/src src/StgFEM/SLE/LinearAlgebra/src

walter at geodynamics.org walter at geodynamics.org
Mon Apr 16 16:34:46 PDT 2007


Author: walter
Date: 2007-04-16 16:34:45 -0700 (Mon, 16 Apr 2007)
New Revision: 6585

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/shortcuts.h
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.h
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_Algorithms.h
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_ElementType.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MGOpGenerator.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Matrix.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MatrixSolver.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScMatrix.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h
Log:
 r1804 at earth:  boo | 2007-04-16 16:33:01 -0700
 Change VirtualCall to VirtualCall{1,2,3,4,5,6} for C89 compatibility



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1801
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1804

Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/shortcuts.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/shortcuts.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/shortcuts.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -50,13 +50,18 @@
 #endif
 
 
-#ifndef NDEBUG
-#define VirtualCall( self, method, ... )						\
-	(assert( self ), assert( (self)->method ), (self)->method( __VA_ARGS__ ))
-#else
-#define VirtualCall( self, method, ... )	\
-	(self)->method( __VA_ARGS__ )
-#endif
+#define VirtualCall1( self, method, a )	\
+	(self)->method( a )
+#define VirtualCall2( self, method, a, b )	\
+	(self)->method( a, b )
+#define VirtualCall3( self, method, a, b, c )	\
+	(self)->method( a, b, c )
+#define VirtualCall4( self, method, a, b, c, d )	\
+	(self)->method( a, b, c, d )
+#define VirtualCall5( self, method, a, b, c, d, e )	\
+	(self)->method( a, b, c, d, e )
+#define VirtualCall6( self, method, a, b, c, d, e, f )	\
+	(self)->method( a, b, c, d, e, f )
 
 
 #define AllocArray( type, size )					\

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGenerator.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -107,10 +107,10 @@
 	void _MeshGenerator_SetDimSize( void* meshGenerator, unsigned nDims );
 
 	#define MeshGenerator_SetDimSize( self, nDims )			\
-		VirtualCall( self, setDimSizeFunc, self, nDims )
+		VirtualCall2( self, setDimSizeFunc, self, nDims )
 
 	#define MeshGenerator_Generate( self, mesh )			\
-		VirtualCall( self, generateFunc, self, mesh )
+		VirtualCall2( self, generateFunc, self, mesh )
 
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Public functions

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_Algorithms.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_Algorithms.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_Algorithms.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -141,13 +141,13 @@
 	*/
 
 	#define Mesh_Algorithms_SetMesh( self, mesh )							\
-		VirtualCall( self, setMeshFunc, self, mesh )
+		VirtualCall2( self, setMeshFunc, self, mesh )
 
 	#define Mesh_Algorithms_Update( self )								\
-		VirtualCall( self, updateFunc, self )
+		VirtualCall1( self, updateFunc, self )
 
 	#define Mesh_Algorithms_NearestVertex( self, point )					\
-		VirtualCall( self, nearestVertexFunc, self, point )
+		VirtualCall2( self, nearestVertexFunc, self, point )
 
 	#define Mesh_Algorithms_Search( algorithms, point, dim, ind )				\
 		(assert( (algorithms) && ((Mesh_Algorithms*)algorithms)->searchFunc ),			\

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_ElementType.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_ElementType.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Mesh_ElementType.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -97,16 +97,16 @@
 	void _Mesh_ElementType_GetCentroid( void* elementType, unsigned element, double* centroid );
 
 	#define Mesh_ElementType_Update( self )							\
-		VirtualCall( self, updateFunc, self )
+		VirtualCall1( self, updateFunc, self )
 
 	#define Mesh_ElementType_ElementHasPoint( self, element, point, dim, ind )		\
-		VirtualCall( self, elementHasPointFunc, self, element, point, dim, ind )
+		VirtualCall5( self, elementHasPointFunc, self, element, point, dim, ind )
 
 	#define Mesh_ElementType_GetMinimumSeparation( self, element, perDim )			\
-		VirtualCall( self, getMinimumSeparationFunc, self, element, perDim )
+		VirtualCall3( self, getMinimumSeparationFunc, self, element, perDim )
 
 	#define Mesh_ElementType_GetCentroid( self, element, centroid )				\
-		VirtualCall( self, getCentroidFunc, self, element, centroid )
+		VirtualCall3( self, getCentroidFunc, self, element, centroid )
 
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Public functions

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MGOpGenerator.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MGOpGenerator.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MGOpGenerator.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -101,13 +101,13 @@
 	void _MGOpGenerator_SetNumLevels( void* mgOpGenerator, unsigned nLevels );
 
 	#define MGOpGenerator_SetNumLevels( self, nLevels )		\
-		VirtualCall( self, setNumLevelsFunc, self, nLevels )
+		VirtualCall2( self, setNumLevelsFunc, self, nLevels )
 
 	#define MGOpGenerator_HasExpired( self )			\
-		VirtualCall( self, hasExpiredFunc, self )
+		VirtualCall1( self, hasExpiredFunc, self )
 
 	#define MGOpGenerator_Generate( self, pOps, rOps )		\
-		VirtualCall( self, generateFunc, self, pOps, rOps )
+		VirtualCall3( self, generateFunc, self, pOps, rOps )
 
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Public functions

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Matrix.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Matrix.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Matrix.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -219,91 +219,91 @@
 	void _Matrix_AssemblyBegin( void* matrix );
 
 	#define Matrix_SetComm( self, comm )									\
-		VirtualCall( self, setCommFunc, self, comm )
+		VirtualCall2( self, setCommFunc, self, comm )
 
 	#define Matrix_SetGlobalSize( self, nRows, nColumns )							\
-		VirtualCall( self, setGlobalSizeFunc, self, nRows, nColumns )
+		VirtualCall3( self, setGlobalSizeFunc, self, nRows, nColumns )
 
 	#define Matrix_SetLocalSize( self, nRows, nColumns )							\
-		VirtualCall( self, setLocalSizeFunc, self, nRows, nColumns )
+		VirtualCall3( self, setLocalSizeFunc, self, nRows, nColumns )
 
 	#define Matrix_AddEntries( self, nRows, rowIndices, nColumns, columnIndices, values )			\
-		VirtualCall( self, addEntriesFunc, self, nRows, rowIndices, nColumns, columnIndices, values )
+		VirtualCall6( self, addEntriesFunc, self, nRows, rowIndices, nColumns, columnIndices, values )
 
 	#define Matrix_InsertEntries( self, nRows, rowIndices, nColumns, columnIndices, values )		\
-		VirtualCall( self, insertEntriesFunc, self, nRows, rowIndices, nColumns, columnIndices, values )
+		VirtualCall6( self, insertEntriesFunc, self, nRows, rowIndices, nColumns, columnIndices, values )
 
 	#define Matrix_DiagonalAddEntries( self, vector )							\
-		VirtualCall( self, diagonalAddEntriesFunc, self, vector )
+		VirtualCall2( self, diagonalAddEntriesFunc, self, vector )
 
 	#define Matrix_DiagonalInsertEntries( self, vector )							\
-		VirtualCall( self, diagonalInsertEntriesFunc, self, vector )
+		VirtualCall2( self, diagonalInsertEntriesFunc, self, vector )
 
 	#define Matrix_Zero( self )										\
-		VirtualCall( self, zeroFunc, self )
+		VirtualCall1( self, zeroFunc, self )
 
 	#define Matrix_Load( self, filename )									\
-		VirtualCall( self, loadFunc, self, filename )
+		VirtualCall2( self, loadFunc, self, filename )
 
 	#define Matrix_AssemblyBegin( self )								\
-		VirtualCall( self, assemblyBeginFunc, self )
+		VirtualCall1( self, assemblyBeginFunc, self )
 
 	#define Matrix_AssemblyEnd( self )								\
-		VirtualCall( self, assemblyEndFunc, self )
+		VirtualCall1( self, assemblyEndFunc, self )
 
 	#define Matrix_Scale( self, factor )								\
-		VirtualCall( self, scaleFunc, self, factor )
+		VirtualCall2( self, scaleFunc, self, factor )
 
 	#define Matrix_AddScaled( self, factor, matrix0 )						\
-		VirtualCall( self, addScaledFunc, self, factor, matrix0 )
+		VirtualCall3( self, addScaledFunc, self, factor, matrix0 )
 
 	#define Matrix_DiagonalScale( self, leftVector, rightVector )					\
-		VirtualCall( self, diagonalScaleFunc, self, leftVector, rightVector )
+		VirtualCall3( self, diagonalScaleFunc, self, leftVector, rightVector )
 
 	#define Matrix_Multiply( self, vector, dstVector )						\
-		VirtualCall( self, multiplyFunc, self, vector, dstVector )
+		VirtualCall3( self, multiplyFunc, self, vector, dstVector )
 
 	#define Matrix_TransposeMultiply( self, vector, dstVector )					\
-		VirtualCall( self, transposeMultiplyFunc, self, vector, dstVector )
+		VirtualCall3( self, transposeMultiplyFunc, self, vector, dstVector )
 
 	#define Matrix_MultiplyAdd( self, vector0, vector1, dstVector )					\
-		VirtualCall( self, multiplyAddFunc, self, vector0, vector1, dstVector )
+		VirtualCall4( self, multiplyAddFunc, self, vector0, vector1, dstVector )
 
 	#define Matrix_PAPt( self, P, dstMatrix )							\
-		VirtualCall( self, paptFunc, self, P, dstMatrix )
+		VirtualCall3( self, paptFunc, self, P, dstMatrix )
 
 	#define Matrix_PtAP( self, P, dstMatrix )							\
-		VirtualCall( self, ptapFunc, self, P, dstMatrix )
+		VirtualCall3( self, ptapFunc, self, P, dstMatrix )
 
 	#define Matrix_MatrixMultiply( self, matrix0, dstMatrix )					\
-		VirtualCall( self, matrixMultiplyFunc, self, matrix0, dstMatrix )
+		VirtualCall3( self, matrixMultiplyFunc, self, matrix0, dstMatrix )
 
 	#define Matrix_L2Norm( self )									\
-		VirtualCall( self, l2NormFunc, self )
+		VirtualCall1( self, l2NormFunc, self )
 
 	#define Matrix_Transpose( self, dstMatrix )							\
-		VirtualCall( self, transposeFunc, self, dstMatrix )
+		VirtualCall2( self, transposeFunc, self, dstMatrix )
 
 	#define Matrix_GetGlobalSize( self, nRows, nColumns )						\
-		VirtualCall( self, getGlobalSizeFunc, self, nRows, nColumns )
+		VirtualCall3( self, getGlobalSizeFunc, self, nRows, nColumns )
 
 	#define Matrix_GetLocalSize( self, nRows, nColumns )						\
-		VirtualCall( self, getLocalSizeFunc, self, nRows, nColumns )
+		VirtualCall3( self, getLocalSizeFunc, self, nRows, nColumns )
 
 	#define Matrix_GetRow( self, rowIndex, nEntries, columnIndices, values )			\
-		VirtualCall( self, getRowFunc, self, rowIndex, nEntries, columnIndices, values )
+		VirtualCall5( self, getRowFunc, self, rowIndex, nEntries, columnIndices, values )
 
 	#define Matrix_RestoreRow( self, rowIndex, nEntries, columnIndices, values )			\
-		VirtualCall( self, restoreRowFunc, self, rowIndex, nEntries, columnIndices, values )
+		VirtualCall5( self, restoreRowFunc, self, rowIndex, nEntries, columnIndices, values )
 
 	#define Matrix_GetDiagonal( self, vector )							\
-		VirtualCall( self, getDiagonalFunc, self, vector )
+		VirtualCall2( self, getDiagonalFunc, self, vector )
 
 	#define Matrix_Duplicate( self, dstMatrix )							\
-		VirtualCall( self, duplicateFunc, self, dstMatrix )
+		VirtualCall2( self, duplicateFunc, self, dstMatrix )
 
 	#define Matrix_CopyEntries( self, dstMatrix )							\
-		VirtualCall( self, copyEntriesFunc, self, dstMatrix )
+		VirtualCall2( self, copyEntriesFunc, self, dstMatrix )
 
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Public functions

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MatrixSolver.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MatrixSolver.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MatrixSolver.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -152,40 +152,40 @@
 	void _MatrixSolver_Setup( void* matrixSolver, void* rhs, void* solution );
 
 	#define MatrixSolver_SetComm( self, comm )			\
-		VirtualCall( self, setCommFunc, self, comm )
+		VirtualCall2( self, setCommFunc, self, comm )
 
 	#define MatrixSolver_SetMatrix( self, matrix )			\
-		VirtualCall( self, setMatrixFunc, self, matrix )
+		VirtualCall2( self, setMatrixFunc, self, matrix )
 
 	#define MatrixSolver_SetMaxIterations( self, nIterations )	\
-		VirtualCall( self, setMaxIterationsFunc, self, nIterations )
+		VirtualCall2( self, setMaxIterationsFunc, self, nIterations )
 
 	#define MatrixSolver_SetRelativeTolerance( self, tolerance )	\
-		VirtualCall( self, setRelativeToleranceFunc, self, tolerance )
+		VirtualCall2( self, setRelativeToleranceFunc, self, tolerance )
 
 	#define MatrixSolver_SetAbsoluteTolerance( self, tolerance )	\
-		VirtualCall( self, setAbsoluteToleranceFunc, self, tolerance )
+		VirtualCall2( self, setAbsoluteToleranceFunc, self, tolerance )
 
 	#define MatrixSolver_SetUseInitialSolution( self, state )	\
-		VirtualCall( self, setUseInitialSolutionFunc, self, state )
+		VirtualCall2( self, setUseInitialSolutionFunc, self, state )
 
 	#define MatrixSolver_Solve( self, rhs, solution )			\
-		VirtualCall( self, solveFunc, self, rhs, solution )
+		VirtualCall3( self, solveFunc, self, rhs, solution )
 
 	#define MatrixSolver_Setup( self, rhs, solution )		\
-		VirtualCall( self, setupFunc, self, rhs, solution )
+		VirtualCall3( self, setupFunc, self, rhs, solution )
 
 	#define MatrixSolver_GetSolveStatus( self )			\
-		VirtualCall( self, getSolveStatusFunc, self )
+		VirtualCall1( self, getSolveStatusFunc, self )
 
 	#define MatrixSolver_GetIterations( self )			\
-		VirtualCall( self, getIterationsFunc, self )
+		VirtualCall1( self, getIterationsFunc, self )
 
 	#define MatrixSolver_GetMaxIterations( self )			\
-		VirtualCall( self, getMaxIterationsFunc, self )
+		VirtualCall1( self, getMaxIterationsFunc, self )
 
 	#define MatrixSolver_GetResidualNorm( self )			\
-		VirtualCall( self, getResidualNormFunc, self )
+		VirtualCall1( self, getResidualNormFunc, self )
 
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Public functions

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScMatrix.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScMatrix.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/PETScMatrix.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -131,7 +131,7 @@
 					       unsigned* diagonalNonZeroIndices, unsigned* offDiagonalNonZeroIndices);
 
 	#define PETScMatrix_SetNonZeroStructure( self, nNonZeros, diagonalNonZeroIndices, offDiagonalNonZeroIndices)		\
-		VirtualCall( self, setNonZeroStructure, self, nNonZeros, diagonalNonZeroIndices, offDiagonalNonZeroIndices)
+		VirtualCall4( self, setNonZeroStructure, self, nNonZeros, diagonalNonZeroIndices, offDiagonalNonZeroIndices)
 
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Public functions

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h	2007-04-16 22:38:30 UTC (rev 6584)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h	2007-04-16 23:34:45 UTC (rev 6585)
@@ -203,85 +203,85 @@
 	void _Vector_View( void* vector, void* stream );
 
 	#define Vector_SetComm( self, comm )			\
-		VirtualCall( self, setCommFunc, self, comm )
+		VirtualCall2( self, setCommFunc, self, comm )
 
 	#define Vector_SetGlobalSize( self, size )	\
-		VirtualCall( self, setGlobalSizeFunc, self, size )
+		VirtualCall2( self, setGlobalSizeFunc, self, size )
 
 	#define Vector_SetLocalSize( self, size )	\
-		VirtualCall( self, setLocalSizeFunc, self, size )
+		VirtualCall2( self, setLocalSizeFunc, self, size )
 
 	#define Vector_AddEntries( self, nEntries, indices, values )	\
-		VirtualCall( self, addEntriesFunc, self, nEntries, indices, values )
+		VirtualCall4( self, addEntriesFunc, self, nEntries, indices, values )
 
 	#define Vector_InsertEntries( self, nEntries, indices, values )	\
-		VirtualCall( self, insertEntriesFunc, self, nEntries, indices, values )
+		VirtualCall4( self, insertEntriesFunc, self, nEntries, indices, values )
 
 	#define Vector_SetScalar( self, scalar )	\
-		VirtualCall( self, setScalarFunc, self, scalar )
+		VirtualCall2( self, setScalarFunc, self, scalar )
 
 	#define Vector_Zero( self )	\
-		VirtualCall( self, zeroFunc, self )
+		VirtualCall1( self, zeroFunc, self )
 
 	#define Vector_AssemblyBegin( self )	\
-		VirtualCall( self, assemblyBeginFunc, self )
+		VirtualCall1( self, assemblyBeginFunc, self )
 
 	#define Vector_AssemblyEnd( self )	\
-		VirtualCall( self, assemblyEndFunc, self )
+		VirtualCall1( self, assemblyEndFunc, self )
 
 	#define Vector_Add( self, vector0 )		\
-		VirtualCall( self, addFunc, self, vector0 )
+		VirtualCall2( self, addFunc, self, vector0 )
 
 	#define Vector_AddScaled( self, scalar, vector0 )	\
-		VirtualCall( self, addScaledFunc, self, scalar, vector0 )
+		VirtualCall3( self, addScaledFunc, self, scalar, vector0 )
 
 	#define Vector_ScaleAdd( self, scalar, vector0 )	\
-		VirtualCall( self, scaleAddFunc, self, scalar, vector0 )
+		VirtualCall3( self, scaleAddFunc, self, scalar, vector0 )
 
 	#define Vector_Subtract( self, vector0 )	\
-		VirtualCall( self, subtractFunc, self, vector0 )
+		VirtualCall2( self, subtractFunc, self, vector0 )
 
 	#define Vector_Scale( self, factor )	\
-		VirtualCall( self, scaleFunc, self, factor )
+		VirtualCall2( self, scaleFunc, self, factor )
 
 	#define Vector_DotProduct( self, vector0 )	\
-		VirtualCall( self, dotProductFunc, self, vector0 )
+		VirtualCall2( self, dotProductFunc, self, vector0 )
 
 	#define Vector_L2Norm( self )	\
-		VirtualCall( self, l2NormFunc, self )
+		VirtualCall1( self, l2NormFunc, self )
 
 	#define Vector_LInfNorm( self )	\
-		VirtualCall( self, lInfNormFunc, self )
+		VirtualCall1( self, lInfNormFunc, self )
 
 	#define Vector_PointwiseMultiply( self, enumVec, denomVec )			\
-		VirtualCall( self, pointwiseMultiplyFunc, self, enumVec, denomVec )
+		VirtualCall3( self, pointwiseMultiplyFunc, self, enumVec, denomVec )
 
 	#define Vector_PointwiseDivide( self, enumVec, denomVec )			\
-		VirtualCall( self, pointwiseDivideFunc, self, enumVec, denomVec )
+		VirtualCall3( self, pointwiseDivideFunc, self, enumVec, denomVec )
 
 	#define Vector_Reciprocal( self )	\
-		VirtualCall( self, reciprocalFunc, self )
+		VirtualCall1( self, reciprocalFunc, self )
 
 	#define Vector_GetGlobalSize( self )	\
-		VirtualCall( self, getSizeFunc, self )
+		VirtualCall1( self, getSizeFunc, self )
 
 	#define Vector_GetLocalSize( self )	\
-		VirtualCall( self, getLocalSizeFunc, self )
+		VirtualCall1( self, getLocalSizeFunc, self )
 
 	#define Vector_GetArray( self, array )			\
-		VirtualCall( self, getArrayFunc, self, array )
+		VirtualCall2( self, getArrayFunc, self, array )
 
 	#define Vector_RestoreArray( self, array )	\
-		VirtualCall( self, restoreArrayFunc, self, array )
+		VirtualCall2( self, restoreArrayFunc, self, array )
 
 	#define Vector_Duplicate( self, dstVector )	\
-		VirtualCall( self, duplicateFunc, self, dstVector )
+		VirtualCall2( self, duplicateFunc, self, dstVector )
 
 	#define Vector_CopyEntries( self, dstVector )	\
-		VirtualCall( self, copyEntriesFunc, self, dstVector )
+		VirtualCall2( self, copyEntriesFunc, self, dstVector )
 
 	#define Vector_View( self, stream )			\
-		VirtualCall( self, viewFunc, self, stream )
+		VirtualCall2( self, viewFunc, self, stream )
 
 	/*--------------------------------------------------------------------------------------------------------------------------
 	** Public functions



More information about the cig-commits mailing list