[cig-commits] commit: Change uint to unsigned int for OS X

[Mercurial]

changeset:   813:762bfb483813
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Sat Oct 22 19:00:22 2011 -0700
files:       Base/Context/src/AbstractContext.cxx Base/Context/src/AbstractContext.h
description:
Change uint to unsigned int for OS X


diff -r 7d1daa30af5f -r 762bfb483813 Base/Context/src/AbstractContext.cxx
--- a/Base/Context/src/AbstractContext.cxx	Sat Oct 22 18:59:42 2011 -0700
+++ b/Base/Context/src/AbstractContext.cxx	Sat Oct 22 19:00:22 2011 -0700
@@ -501,7 +501,7 @@ void _AbstractContext_AssignFromXML( voi
 	/* Note: these try for deprecated key "maxLoops" as well as new one "maxTimeSteps" - Main.PatrickSunter - 4 November 2004 */
 	dictEntryVal = Dictionary_Get( self->dictionary, (Dictionary_Entry_Key)"maxLoops" );
 	if ( NULL == dictEntryVal  ) {
-          dictEntryVal = Dictionary_GetDefault( self->dictionary, "maxTimeSteps", Dictionary_Entry_Value_FromUnsignedInt( std::numeric_limits<uint>::max()));
+          dictEntryVal = Dictionary_GetDefault( self->dictionary, "maxTimeSteps", Dictionary_Entry_Value_FromUnsignedInt( std::numeric_limits<unsigned int>::max()));
 	}
 	self->maxTimeSteps = Dictionary_Entry_Value_AsUnsignedInt( dictEntryVal );
 
@@ -771,11 +771,11 @@ void _AbstractContext_Execute_Hook( void
 	double             dt = 0;
 	double             dtLoadedFromFile = 0;
 	
-	if (self->maxTimeSteps!=std::numeric_limits<uint>::max()) {
+	if (self->maxTimeSteps!=std::numeric_limits<unsigned int>::max()) {
 		Journal_RPrintf( self->info, "Run until %u timeSteps have been run\n", self->maxTimeSteps );
 	}
 	if (self->finalTimeStep ) {
-		if (self->maxTimeSteps!=std::numeric_limits<uint>::max()) {
+		if (self->maxTimeSteps!=std::numeric_limits<unsigned int>::max()) {
 			Journal_RPrintf( self->info, "or " );
 		}	
 		else {
@@ -785,7 +785,7 @@ void _AbstractContext_Execute_Hook( void
 	}
 	
 	if (self->stopTime) {
-		if (self->maxTimeSteps!=std::numeric_limits<uint>::max()
+		if (self->maxTimeSteps!=std::numeric_limits<unsigned int>::max()
                     || self->finalTimeStep ) {
 			Journal_RPrintf( self->info, "or " );
 		}	
@@ -850,7 +850,7 @@ void _AbstractContext_Execute_Hook( void
 			}
 		}	
 
-		if (self->maxTimeSteps!=std::numeric_limits<uint>::max()
+		if (self->maxTimeSteps!=std::numeric_limits<unsigned int>::max()
                     && (self->timeStepSinceJobRestart >= self->maxTimeSteps))
                   break;
 		if (self->finalTimeStep
diff -r 7d1daa30af5f -r 762bfb483813 Base/Context/src/AbstractContext.h
--- a/Base/Context/src/AbstractContext.h	Sat Oct 22 18:59:42 2011 -0700
+++ b/Base/Context/src/AbstractContext.h	Sat Oct 22 19:00:22 2011 -0700
@@ -107,7 +107,7 @@
 			maxTimeSteps (which is now relative to job restart).*/ \
 		unsigned int				timeStepSinceJobRestart; \
 		/** Maximum number of time steps to run for. If set to 0, then this will  be ignored. */ \
-		uint				        maxTimeSteps; \
+		unsigned int			        maxTimeSteps; \
 		/** Final Time Step: last time step to run till, no matter if maxTimeSteps still has some
 		     left in a checkpoint restart run. If 0 (the default), not active. */ \
 		unsigned int				finalTimeStep; \