[Avida-SVN] r1196 - in development/source: analyze cpu main

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-01-16 15:06:48 -0500 (Tue, 16 Jan 2007)
New Revision: 1196

Modified:
   development/source/analyze/cAnalyze.cc
   development/source/cpu/cHardwareCPU.cc
   development/source/main/cSpatialResCount.cc
   development/source/main/cTaskLib.cc
Log:
Fix various compile warnings.   Also work around a bug in GCC on Intel Macs (mainline gcc bug that hasn't been patched in the Apple release yet) that improperly imports a duplicate copy of llabs into the unscoped resolution namespace. 

Modified: development/source/analyze/cAnalyze.cc
===================================================================
--- development/source/analyze/cAnalyze.cc	2007-01-16 14:22:21 UTC (rev 1195)
+++ development/source/analyze/cAnalyze.cc	2007-01-16 20:06:48 UTC (rev 1196)
@@ -7973,7 +7973,7 @@
     cString cur_input(text_input);
     cString command = cur_input.PopWord();
     
-    cAnalyzeCommand* cur_command;
+    cAnalyzeCommand* cur_command = NULL;
     cAnalyzeCommandDefBase* command_def = FindAnalyzeCommandDef(command);
     if (command == "") {
       // Don't worry about blank lines...

Modified: development/source/cpu/cHardwareCPU.cc
===================================================================
--- development/source/cpu/cHardwareCPU.cc	2007-01-16 14:22:21 UTC (rev 1195)
+++ development/source/cpu/cHardwareCPU.cc	2007-01-16 20:06:48 UTC (rev 1196)
@@ -2564,6 +2564,7 @@
 {
   ReadLabel();
   //organism->GetPhenotype().ActivateTransposon(GetLabel());
+  return true;
 }
 
 void cHardwareCPU::Divide_DoTransposons(cAvidaContext& ctx)

Modified: development/source/main/cSpatialResCount.cc
===================================================================
--- development/source/main/cSpatialResCount.cc	2007-01-16 14:22:21 UTC (rev 1195)
+++ development/source/main/cSpatialResCount.cc	2007-01-16 20:06:48 UTC (rev 1196)
@@ -379,7 +379,7 @@
 
 void cSpatialResCount::CellOutflow() const {
 
-  double  deltaamount;
+  double deltaamount = 0.0;
 
   for (int i=0; i < cell_list_ptr->GetSize(); i++) {
     const int cell_id = (*cell_list_ptr)[i].GetId();

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2007-01-16 14:22:21 UTC (rev 1195)
+++ development/source/main/cTaskLib.cc	2007-01-16 20:06:48 UTC (rev 1196)
@@ -1898,7 +1898,7 @@
   double quality = 0.0;
   const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
 
-  long long diff = llabs((long long)args.GetInt(0) - ctx.GetOutputBuffer()[0]);
+  long long diff = ::llabs((long long)args.GetInt(0) - ctx.GetOutputBuffer()[0]);
   int threshold = args.GetInt(1);
     
   if (threshold < 0 || diff <= threshold) { // Negative threshold == infinite
@@ -2119,7 +2119,7 @@
   for (int i = 0; i < input_size; i ++) {
     for (int j = 0; j < input_size; j ++) {
       if (i == j) continue;
-      long long cur_diff = llabs((long long)(input_buffer[i] * input_buffer[j]) - test_output);
+      long long cur_diff = ::llabs((long long)(input_buffer[i] * input_buffer[j]) - test_output);
       if (cur_diff < diff) diff = cur_diff;
     }
   }
@@ -2163,7 +2163,7 @@
   for (int i = 0; i < input_size; i ++) {
     for (int j = 0; j < input_size; j ++) {
       if (i == j || input_buffer[j] == 0) continue;
-      long long cur_diff = llabs((long long)(input_buffer[i] / input_buffer[j]) - test_output);
+      long long cur_diff = ::llabs((long long)(input_buffer[i] / input_buffer[j]) - test_output);
       if (cur_diff < diff) diff = cur_diff;
     }
   }
@@ -2205,7 +2205,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = llabs((long long)(log(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = ::llabs((long long)(log(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2247,7 +2247,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = llabs((long long)(log2(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = ::llabs((long long)(log2(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2289,7 +2289,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = llabs((long long)(log10(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+    long long cur_diff = ::llabs((long long)(log10(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2331,7 +2331,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = llabs((long long)(sqrt(fabs(double(input_buffer[i])))) - test_output);
+    long long cur_diff = ::llabs((long long)(sqrt(fabs(double(input_buffer[i])))) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2373,7 +2373,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = llabs((long long)(sin(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
+    long long cur_diff = ::llabs((long long)(sin(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }
   
@@ -2414,7 +2414,7 @@
   long long diff = ((long long)INT_MAX + 1) * 2;
   
   for (int i = 0; i < input_size; i ++) {
-    long long cur_diff = llabs((long long)(cos(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
+    long long cur_diff = ::llabs((long long)(cos(double(input_buffer[i]) / dCastPrecision) * dCastPrecision) - test_output);
     if (cur_diff < diff) diff = cur_diff;
   }