[cig-commits] commit: Fix an errant regex that replaced CAUTIOUS with CAUTContextUS
Mercurial
hg at geodynamics.org
Tue Sep 27 15:21:14 PDT 2011
changeset: 804:a27b98229e72
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Tue Sep 27 15:19:44 2011 -0700
files: Base/Context/src/Variable.h
description:
Fix an errant regex that replaced CAUTIOUS with CAUTContextUS
diff -r af2c9573fcd7 -r a27b98229e72 Base/Context/src/Variable.h
--- a/Base/Context/src/Variable.h Fri May 13 12:00:39 2011 -0700
+++ b/Base/Context/src/Variable.h Tue Sep 27 15:19:44 2011 -0700
@@ -274,8 +274,8 @@
( ( (self)->offsetCount < 2 ) ? \
( (void*)( (ArithPointer)(self)->arrayPtr + (ArithPointer)(array_I) * (ArithPointer)( (self)->structSize) + (ArithPointer)( (self)->offsets[0] ) )) : \
( (void*)((ArithPointer)(self)->arrayPtr + (ArithPointer)(array_I) * (ArithPointer)((self)->structSize)) ) )
- #ifdef CAUTContextUS
- /** Implementation of "get" the structure in an array that the requested data member is in if CAUTContextUS is defined.
+ #ifdef CAUTIOUS
+ /** Implementation of "get" the structure in an array that the requested data member is in if CAUTIOUS is defined.
* It ensures that array_I is within its bounds. Private (Do not directly use!) */
#define _Variable_GetStructPtr( self, array_I ) \
( ((array_I) < (self)->arraySize) ? \
@@ -288,7 +288,7 @@
"out of range (array size is %d). Exiting.\n", (self)->name, array_I, \
(self)->arraySize ), NULL) )
#else
- /** Implementation of "get" the structure in an array, that the requested data member is in if CAUTContextUS is NOT
+ /** Implementation of "get" the structure in an array, that the requested data member is in if CAUTIOUS is NOT
* defined. It DOES NOT ensure that array_I is within its bounds. Private (Do not directly use!) */
#define _Variable_GetStructPtr __Variable_GetStructPtr
#endif
@@ -301,8 +301,8 @@
some architectures such as the SGI Altix is of a different size to the ArithPointer (unsigned long) */
#define __Variable_GetPtr( self, array_I, component_I, vector_I ) \
( (void*)((ArithPointer)(self)->arrayPtr + (ArithPointer)(array_I) * (self)->structSize + (self)->offsets[component_I]) )
- #ifdef CAUTContextUS
- /** Implementation of "get" the requested data member in a structure in an array if CAUTContextUS is defined.
+ #ifdef CAUTIOUS
+ /** Implementation of "get" the requested data member in a structure in an array if CAUTIOUS is defined.
* It ensures that component_I and array_I are within its bounds. Private (Do not directly use!) */
#define _Variable_GetPtr( self, array_I, component_I, vector_I ) \
( ((component_I) < (self)->offsetCount) ? \
@@ -312,7 +312,7 @@
Journal_Register( Error_Type, Variable_Type ), \
"Offset array_I out of range\n" ), NULL) )
#else
- /** Implementation of "get" the requested data member in a structure in an array if CAUTContextUS is NOT
+ /** Implementation of "get" the requested data member in a structure in an array if CAUTIOUS is NOT
* defined. It DOES NOT ensure that component_I and array_I are within its bounds. Private (Do not directly
* use!) */
#define _Variable_GetPtr __Variable_GetPtr
@@ -327,7 +327,7 @@
* (Do not directly use!). */
#define _Variable_GetPtrChar( self, array_I ) \
( (char*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a "char" inbuilt type, return a pointer to that char (type casted to char*).
* It ensures the Variable is of a "char" and is not complex. */
#define Variable_GetPtrChar( self, array_I ) \
@@ -347,7 +347,7 @@
/** Assuming this is a Variable of a vector "char" inbuilt type, return that char. Private (Do not directly use!). */
#define _Variable_GetValueAtChar( self, array_I, vector_I ) \
( Variable_GetPtrChar( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a vector "char" inbuilt type, return that char. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtChar( self, array_I, vector_I ) \
@@ -431,7 +431,7 @@
* (Do not directly use!). */
#define _Variable_GetPtrShort( self, array_I ) \
( (short*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a "short" inbuilt type, return a pointer to that short (type casted to short*).
* It ensures the Variable is of a "short" and is not complex. */
#define Variable_GetPtrShort( self, array_I ) \
@@ -451,7 +451,7 @@
/** Assuming this is a Variable of a vector "short" inbuilt type, return that short. Private (Do not directly use!). */
#define _Variable_GetValueAtShort( self, array_I, vector_I ) \
( Variable_GetPtrShort( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a vector "short" inbuilt type, return that short. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtShort( self, array_I, vector_I ) \
@@ -536,7 +536,7 @@
* (Do not directly use!). */
#define _Variable_GetPtrInt( self, array_I ) \
( (int*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a "int" inbuilt type, return a pointer to that int (type casted to int*).
* It ensures the Variable is of a "int" and is not complex. */
#define Variable_GetPtrInt( self, array_I ) \
@@ -556,7 +556,7 @@
/** Assuming this is a Variable of a vector "int" inbuilt type, return that int. Private (Do not directly use!). */
#define _Variable_GetValueAtInt( self, array_I, vector_I ) \
( Variable_GetPtrInt( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a vector "int" inbuilt type, return that int. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtInt( self, array_I, vector_I ) \
@@ -639,7 +639,7 @@
* (Do not directly use!). */
#define _Variable_GetPtrFloat( self, array_I ) \
( (float*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a "float" inbuilt type, return a pointer to that float (type casted to float*).
* It ensures the Variable is of a "float" and is not complex. */
#define Variable_GetPtrFloat( self, array_I ) \
@@ -659,7 +659,7 @@
/** Assuming this is a Variable of a vector "float" inbuilt type, return that float. Private (Do not directly use!). */
#define _Variable_GetValueAtFloat( self, array_I, vector_I ) \
( Variable_GetPtrFloat( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a vector "float" inbuilt type, return that float. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtFloat( self, array_I, vector_I ) \
@@ -744,7 +744,7 @@
* Private (Do not directly use!). */
#define _Variable_GetPtrDouble( self, array_I ) \
( (double*)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a "double" inbuilt type, return a pointer to that double (type casted to
* double*). It ensures the Variable is of a "double" and is not complex. */
#define Variable_GetPtrDouble( self, array_I ) \
@@ -764,7 +764,7 @@
/** Assuming this is a Variable of a vector "double" inbuilt type, return that double. Private (Do not directly use!). */
#define _Variable_GetValueAtDouble( self, array_I, vector_I ) \
( (Variable_GetPtrDouble( (self), (array_I) ))[(vector_I)] )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a vector "double" inbuilt type, return that double. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtDouble( self, array_I, vector_I ) \
@@ -857,7 +857,7 @@
* Private. (Do not directly use!). */
#define _Variable_GetPtrPointer( self, array_I ) \
( (void**)_Variable_GetStructPtr( (self), (array_I) ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a "pointer" inbuilt type, return a pointer to that pointer (type casted to
* void**). It ensures the Variable is of a "pointer" and is not complex. */
#define Variable_GetPtrPointer( self, array_I ) \
@@ -877,7 +877,7 @@
/** Assuming this is a Variable of a vector "pointer" inbuilt type, return that pointer. Private (Do not directly use!). */
#define _Variable_GetValueAtPointer( self, array_I, vector_I ) \
( Variable_GetPtrPointer( (self), (array_I) )[(vector_I)] )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of a vector "pointer" inbuilt type, return that pointer. It ensures that vector_I is
* within range. */
#define Variable_GetValueAtPointer( self, array_I, vector_I ) \
@@ -970,7 +970,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of any inbuilt type, return a char (type casted to char). It ensures the Variable
* is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsChar( self, array_I ) \
@@ -998,7 +998,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of any inbuilt type, return a short (type casted to short). It ensures the Variable
* is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsShort( self, array_I ) \
@@ -1026,7 +1026,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of any inbuilt type, return a int (type casted to int). It ensures the Variable
* is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsInt( self, array_I ) \
@@ -1054,7 +1054,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of any inbuilt type, return a float (type casted to float). It ensures the Variable
* is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsFloat( self, array_I ) \
@@ -1082,7 +1082,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of any inbuilt type, return a double (type casted to double). It ensures the
* Variable is not complex. Resolution order: char, short, int, float, double, pointer. */
#define Variable_GetValueAsDouble( self, array_I ) \
@@ -1111,7 +1111,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ), NULL) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of any inbuilt type, return a pointer (type casted to void*). It ensures the Variable
* is not complex. Resolution order: pointer, short, int, float, double, pointer. */
#define Variable_GetValueAsPointer( self, array_I ) \
@@ -1141,7 +1141,7 @@
0, \
Journal_Register( Error_Type, Variable_Type ), \
"Variable is not of any inbuilt type, but this macro assumes so.\n" ), NULL) )
- #ifdef CAUTContextUS
+ #ifdef CAUTIOUS
/** Assuming this is a Variable of any inbuilt type, set the value. It ensures the Variable is not complex.
* Resolution order: pointer, short, int, float, double, pointer. */
#define Variable_SetValueFromInbuilt( self, array_I, value ) \
More information about the CIG-COMMITS
mailing list