[Avida-cvs] [avida-svn] r843 - development/source/cpu

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2006-07-17 18:34:59 -0400 (Mon, 17 Jul 2006)
New Revision: 843

Modified:
   development/source/cpu/cHardwareBase.cc
   development/source/cpu/cHardwareCPU.cc
Log:
Hmm...  compile bugs.

Modified: development/source/cpu/cHardwareBase.cc
===================================================================
--- development/source/cpu/cHardwareBase.cc	2006-07-17 20:58:57 UTC (rev 842)
+++ development/source/cpu/cHardwareBase.cc	2006-07-17 22:34:59 UTC (rev 843)
@@ -11,6 +11,7 @@
 #include "cHardwareBase.h"
 
 #include "cAvidaContext.h"
+#include "cCodeLabel.h"
 #include "cCPUTestInfo.h"
 #include "cHardwareManager.h"
 #include "cHeadCPU.h"

Modified: development/source/cpu/cHardwareCPU.cc
===================================================================
--- development/source/cpu/cHardwareCPU.cc	2006-07-17 20:58:57 UTC (rev 842)
+++ development/source/cpu/cHardwareCPU.cc	2006-07-17 22:34:59 UTC (rev 843)
@@ -2531,7 +2531,7 @@
   for (int i = 1; i < num_neighbors; i++) {
     cOrganism* neighbor = organism->GetNeighbor();
     
-    if (neighbor != NULL && neighbor->FindLabelFull(GetLabel()).InMemory()) return true;
+    if (neighbor != NULL && neighbor->GetHardware().FindLabelFull(GetLabel()).InMemory()) return true;
     
     // Otherwise keep rotating...
     organism->Rotate(-1);
@@ -2559,7 +2559,7 @@
   for (int i = 1; i < num_neighbors; i++) {
     cOrganism* neighbor = organism->GetNeighbor();
     
-    if (neighbor != NULL && neighbor->FindLabelFull(GetLabel()).InMemory()) return true;
+    if (neighbor != NULL && neighbor->GetHardware().FindLabelFull(GetLabel()).InMemory()) return true;
     
     // Otherwise keep rotating...
     organism->Rotate(1);