[cig-commits] r5131 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Utils/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-31 13:27:57 -0800 (Tue, 31 Oct 2006)
New Revision: 5131

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Operator.h
Log:
 r3116 at earth:  boo | 2006-10-31 13:26:12 -0800
  r3094 at earth (orig r3871):  SteveQuenette | 2006-10-16 07:06:08 -0700
  "operator" is a c++ keyword
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3115
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3870
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3116
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3871

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Operator.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Operator.h	2006-10-31 21:27:55 UTC (rev 5130)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Operator.h	2006-10-31 21:27:57 UTC (rev 5131)
@@ -102,7 +102,7 @@
 	void Operator_ScalarMultiplication( void* operatorObject, double* operand0, double* operand1, double* result ) ;
 	void Operator_ScalarDivision( void* operatorObject, double* operand0, double* operand1, double* result ) ;
 	void Operator_VectorScale( void* operatorObject, double* operand0, double* operand1, double* result);
-	void Operator_Rounding( void* operator, double* operand0, double* result );
+	void Operator_Rounding( void* operatorObject, double* operand0, double* result );
 	void Operator_HorizontalDivergence( void* operatorObject, double* velocityGradient, double* result ) ;
 	void Operator_VerticalVorticity( void* operatorObject, double* velocityGradient, double* result ) ;
 	void Operator_Divergence( void* operatorObject, double* velocityGradient, double* result ) ;