[Avida-cvs] [avida-svn] r819 - in development: Avida.xcodeproj source/platform/tcmalloc

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2006-07-10 14:51:39 -0400 (Mon, 10 Jul 2006)
New Revision: 819

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/platform/tcmalloc/system-alloc.cc
Log:
Fix a warning in TCMalloc.  Adjust warning settings in Xcode project.

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2006-07-10 15:22:58 UTC (rev 818)
+++ development/Avida.xcodeproj/project.pbxproj	2006-07-10 18:51:39 UTC (rev 819)
@@ -2346,9 +2346,11 @@
 				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				PREBINDING = NO;
 				WARNING_CFLAGS = (
-					"-Wmost",
+					"-Wextra",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
+					"-Wconversion",
+					"-Winline",
 				);
 			};
 			name = Development;
@@ -2370,9 +2372,11 @@
 				GCC_UNROLL_LOOPS = YES;
 				PREBINDING = NO;
 				WARNING_CFLAGS = (
-					"-Wmost",
+					"-Wextra",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
+					"-Wconversion",
+					"-Winline",
 				);
 			};
 			name = "Deployment-G4";
@@ -2391,6 +2395,14 @@
 				INSTALL_PATH = /usr/local/lib;
 				PREBINDING = NO;
 				PRODUCT_NAME = tcmalloc;
+				WARNING_CFLAGS = (
+					"-Wextra",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+					"-Wconversion",
+					"-Winline",
+					"-Wno-sign-compare",
+				);
 				ZERO_LINK = YES;
 			};
 			name = Development;
@@ -2530,9 +2542,11 @@
 				GCC_UNROLL_LOOPS = YES;
 				PREBINDING = NO;
 				WARNING_CFLAGS = (
-					"-Wmost",
+					"-Wextra",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
+					"-Wconversion",
+					"-Winline",
 				);
 			};
 			name = "Deployment-G5";
@@ -2556,9 +2570,11 @@
 				OTHER_CFLAGS = "-falign-loops=16";
 				PREBINDING = NO;
 				WARNING_CFLAGS = (
-					"-Wmost",
+					"-Wextra",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
+					"-Wconversion",
+					"-Winline",
 				);
 			};
 			name = Profile;
@@ -2673,9 +2689,11 @@
 				GCC_UNROLL_LOOPS = YES;
 				PREBINDING = NO;
 				WARNING_CFLAGS = (
-					"-Wmost",
+					"-Wextra",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
+					"-Wconversion",
+					"-Winline",
 				);
 			};
 			name = "Deployment-Intel";

Modified: development/source/platform/tcmalloc/system-alloc.cc
===================================================================
--- development/source/platform/tcmalloc/system-alloc.cc	2006-07-10 15:22:58 UTC (rev 818)
+++ development/source/platform/tcmalloc/system-alloc.cc	2006-07-10 18:51:39 UTC (rev 819)
@@ -94,7 +94,7 @@
 static void* TrySbrk(size_t size, size_t alignment) {
   // sbrk will release memory if passed a negative number, so we do
   // a strict check here
-  if (static_cast<uintptr_t>(size + alignment) < 0) return NULL;
+  if (static_cast<int>(size + alignment) < 0) return NULL;
   
   size = ((size + alignment - 1) / alignment) * alignment;
   void* result = sbrk(size);