List:Commits« Previous MessageNext Message »
From:Kevin Lewis Date:October 23 2008 8:10pm
Subject:bzr commit into mysql-6.0-falcon-team branch (klewis:2878)
View as plain text  
#At file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/

 2878 Kevin Lewis	2008-10-23
      Fix compiler warnings on pushbuild.
      C4288: nonstandard extension used : 'bitNumber' : 
      loop control variable declared in the for-loop is used 
      outside the for-loop scope; it conflicts with the
      declaration in the outer scope
modified:
  storage/falcon/Bitmap.cpp

=== modified file 'storage/falcon/Bitmap.cpp'
--- a/storage/falcon/Bitmap.cpp	2008-10-18 03:46:34 +0000
+++ b/storage/falcon/Bitmap.cpp	2008-10-23 20:10:01 +0000
@@ -722,7 +722,7 @@ void Bitmap::unitTest(void)
 		tester->set(bitNumber);
 		}
 
-	for (int bitNumber = 0; (bitNumber = tester->nextSet(0)) >= 0;)
+	for (bitNumber = 0; (bitNumber = tester->nextSet(0)) >= 0;)
 		{
 		if (!tester->isSet(bitNumber))
 			Log::log("** Error - %d should be set\n", bitNumber);
@@ -750,7 +750,7 @@ void Bitmap::unitTest(void)
 		tester->set(bitNumber);
 		}
 
-	for (int bitNumber = 0; (bitNumber = tester->nextSet(bitNumber)) >= 0;)
+	for (bitNumber = 0; (bitNumber = tester->nextSet(bitNumber)) >= 0;)
 		{
 		Log::log("Clearing bit %d\n", bitNumber);
 		tester->clear(bitNumber);
@@ -773,13 +773,13 @@ void Bitmap::unitTest(void)
 		tester->set(bitNumber);
 		}
 
-	for (int bitNumber = 0; (bitNumber = tester->nextSet( pseudoRand(bitNumber, 1800000))) >= 0;)
+	for (bitNumber = 0; (bitNumber = tester->nextSet( pseudoRand(bitNumber, 1800000))) >= 0;)
 		{
 		Log::log("Clearing bit %d\n", bitNumber);
 		tester->clear(bitNumber);
 		}
 
-	for (int bitNumber = 0; (bitNumber = tester->nextSet(0)) >= 0;)
+	for (bitNumber = 0; (bitNumber = tester->nextSet(0)) >= 0;)
 		{
 		Log::log("Clearing bit %d\n", bitNumber);
 		tester->clear(bitNumber);

Thread
bzr commit into mysql-6.0-falcon-team branch (klewis:2878) Kevin Lewis23 Oct