[Avida-cvs] [avida-svn] r818 - in development: source/analyze source/main support/utils/AvidaUtils

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2006-07-10 11:22:58 -0400 (Mon, 10 Jul 2006)
New Revision: 818

Modified:
   development/source/analyze/cAnalyzeJobQueue.h
   development/source/analyze/cMutationalNeighborhoodResults.h
   development/source/main/cLandscape.h
   development/support/utils/AvidaUtils/CmdLineOpts.py
Log:
Fix SCons so that it works on Rodan.  Fix several compile warnings that cropped up under gcc 4.1.

Modified: development/source/analyze/cAnalyzeJobQueue.h
===================================================================
--- development/source/analyze/cAnalyzeJobQueue.h	2006-07-07 19:53:56 UTC (rev 817)
+++ development/source/analyze/cAnalyzeJobQueue.h	2006-07-10 15:22:58 UTC (rev 818)
@@ -25,6 +25,7 @@
 
 #include <pthread.h>
 
+class cAnalyzeJobWorker;
 class cWorld;
 
 

Modified: development/source/analyze/cMutationalNeighborhoodResults.h
===================================================================
--- development/source/analyze/cMutationalNeighborhoodResults.h	2006-07-07 19:53:56 UTC (rev 817)
+++ development/source/analyze/cMutationalNeighborhoodResults.h	2006-07-10 15:22:58 UTC (rev 818)
@@ -67,7 +67,7 @@
 
   inline int GetSingleTargetTask() const { return m_src.GetSingleTargetTask(); }
   inline double GetSingleProbTargetTask() const { return m_src.GetSingleProbTargetTask(); }
-  inline int GetSingleTask() const { return m_src.GetSingleProbTask(); }
+  inline int GetSingleTask() const { return m_src.GetSingleTask(); }
   inline double GetSingleProbTask() const { return m_src.GetSingleProbTask(); }
   inline int GetSingleKnockout() const { return m_src.GetSingleKnockout(); }
   inline double GetSingleProbKnockout() const { return m_src.GetSingleProbKnockout(); }
@@ -100,7 +100,7 @@
   inline double GetDoubleProbTargetTaskNeutral() const { return m_src.GetDoubleProbTargetTaskNeutral(); }
   inline int GetDoubleTargetTaskLethal() const { return m_src.GetDoubleTargetTaskLethal(); }
   inline double GetDoubleProbTargetTaskLethal() const { return m_src.GetDoubleProbTargetTaskLethal(); }
-  inline int GetDoubleTask() const { return m_src.GetDoubleProbTask(); }
+  inline int GetDoubleTask() const { return m_src.GetDoubleTask(); }
   inline double GetDoubleProbTask() const { return m_src.GetDoubleProbTask(); }
   inline int GetDoubleKnockout() const { return m_src.GetDoubleKnockout(); }
   inline double GetDoubleProbKnockout() const { return m_src.GetDoubleProbKnockout(); }  

Modified: development/source/main/cLandscape.h
===================================================================
--- development/source/main/cLandscape.h	2006-07-07 19:53:56 UTC (rev 817)
+++ development/source/main/cLandscape.h	2006-07-10 15:22:58 UTC (rev 818)
@@ -29,6 +29,7 @@
 class cAvidaContext;
 class cInstSet;
 class cInstruction;
+class cTestCPU;
 class cWorld;
 
 class cLandscape

Modified: development/support/utils/AvidaUtils/CmdLineOpts.py
===================================================================
--- development/support/utils/AvidaUtils/CmdLineOpts.py	2006-07-07 19:53:56 UTC (rev 817)
+++ development/support/utils/AvidaUtils/CmdLineOpts.py	2006-07-10 15:22:58 UTC (rev 818)
@@ -39,6 +39,12 @@
   ) )
   opts.Add(
     SCons.Options.BoolOption(
+      'enableTCMalloc',
+      """Set to "1" to enable TCMalloc""",
+      1,
+  ) )
+  opts.Add(
+    SCons.Options.BoolOption(
       'enableGuiNcurses',
       """Set to "1" to enable building Avida console interface.""",
       0,
@@ -47,13 +53,15 @@
     SCons.Options.BoolOption(
       'enableTestCode',
       """Set to "1" to build and run test code.""",
-      '$plat_default_enableTestCode',
+      0
+#      '$plat_default_enableTestCode',
   ) )
   opts.Add(
     SCons.Options.BoolOption(
       'enablePyPkg',
     """Set to "1" to wrap c++ interfaces for use in Python scripts.""",
-      '$plat_default_enablePyPkg',
+      0
+#      '$plat_default_enablePyPkg',
   ) )
 
   #opts.Add(