[Avida-SVN] r3571 - in branches/biounit: . source/platform/tcmalloc-1.4

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2009-12-21 15:04:23 -0500 (Mon, 21 Dec 2009)
New Revision: 3571

Modified:
   branches/biounit/CMakeLists.txt
   branches/biounit/source/platform/tcmalloc-1.4/pagemap.h
Log:
Update CMakeLists.txt to support new BioGroup classes.

Modified: branches/biounit/CMakeLists.txt
===================================================================
--- branches/biounit/CMakeLists.txt	2009-12-21 19:55:40 UTC (rev 3570)
+++ branches/biounit/CMakeLists.txt	2009-12-21 20:04:23 UTC (rev 3571)
@@ -146,9 +146,13 @@
 # The classification directory
 SET(CLASSIFICATION_DIR ${PROJECT_SOURCE_DIR}/source/classification)
 SET(CLASSIFICATION_SOURCES
+  ${CLASSIFICATION_DIR}/cBGGenotype.cc
+  ${CLASSIFICATION_DIR}/cBGGenotypeManager.cc
+  ${CLASSIFICATION_DIR}/cBioGroup.cc
+  ${CLASSIFICATION_DIR}/cBioGroupManager.cc
+  ${CLASSIFICATION_DIR}/cBioUnit.cc
   ${CLASSIFICATION_DIR}/cClassificationManager.cc
   ${CLASSIFICATION_DIR}/cGenotype.cc
-  ${CLASSIFICATION_DIR}/cGenotype_BirthData.cc
   ${CLASSIFICATION_DIR}/cGenotypeControl.cc
   ${CLASSIFICATION_DIR}/cLineage.cc
   ${CLASSIFICATION_DIR}/cMutationSteps.cc
@@ -247,11 +251,13 @@
   ${MAIN_DIR}/cInstruction.cc
   ${MAIN_DIR}/cLandscape.cc
   ${MAIN_DIR}/cLocalMutations.cc
+  ${MAIN_DIR}/cMetaGenome.cc
   ${MAIN_DIR}/cMutationLib.cc
   ${MAIN_DIR}/cMutationRates.cc
   ${MAIN_DIR}/cMxCodeArray.cc
   ${MAIN_DIR}/cOrganism.cc
   ${MAIN_DIR}/cOrgMessage.cc
+  ${MAIN_DIR}/cParasite.cc
   ${MAIN_DIR}/cPhenotype.cc
   ${MAIN_DIR}/cPhenPlastGenotype.cc
   ${MAIN_DIR}/cPlasticPhenotype.cc

Modified: branches/biounit/source/platform/tcmalloc-1.4/pagemap.h
===================================================================
--- branches/biounit/source/platform/tcmalloc-1.4/pagemap.h	2009-12-21 19:55:40 UTC (rev 3570)
+++ branches/biounit/source/platform/tcmalloc-1.4/pagemap.h	2009-12-21 20:04:23 UTC (rev 3571)
@@ -201,8 +201,8 @@
 class TCMalloc_PageMap3 {
  private:
   // How many bits should we consume at each interior level
-  static const int INTERIOR_BITS = (BITS + 2) / 3; // Round-up
-  static const int INTERIOR_LENGTH = 1 << INTERIOR_BITS;
+  static const unsigned int INTERIOR_BITS = (BITS + 2) / 3; // Round-up
+  static const unsigned int INTERIOR_LENGTH = 1 << INTERIOR_BITS;
 
   // How many bits should we consume at leaf level
   static const int LEAF_BITS = BITS - 2*INTERIOR_BITS;