[Avida-cvs] [Avida2-svn] r248 - in trunk/source: cpu main tools
kaben@myxo.css.msu.edu
kaben at myxo.css.msu.edu
Fri Jul 22 11:10:53 PDT 2005
Author: kaben
Date: 2005-07-22 14:10:53 -0400 (Fri, 22 Jul 2005)
New Revision: 248
Modified:
trunk/source/cpu/cpu_test_info.hh
trunk/source/main/analyze.hh
trunk/source/main/analyze_command.hh
trunk/source/main/analyze_function.hh
trunk/source/main/avida_triggers.hh
trunk/source/main/environment.hh
trunk/source/main/genebank.hh
trunk/source/main/genotype_batch.hh
trunk/source/main/landscape.hh
trunk/source/main/reaction.hh
trunk/source/main/reaction_requisite.hh
trunk/source/main/task_lib.hh
trunk/source/tools/data_file_manager.hh
trunk/source/tools/help_manager.hh
trunk/source/tools/help_type.hh
Log:
Fixups for gcc-4.0 + boost.python : disabled various copy constructors.
Modified: trunk/source/cpu/cpu_test_info.hh
===================================================================
--- trunk/source/cpu/cpu_test_info.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/cpu/cpu_test_info.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -44,6 +44,9 @@
tArray<cOrganism *> org_array;
+private:
+ // disabled copy constructor.
+ cCPUTestInfo(const cCPUTestInfo &);
public:
cCPUTestInfo(int max_tests=TEST_CPU_GENERATIONS);
~cCPUTestInfo();
Modified: trunk/source/main/analyze.hh
===================================================================
--- trunk/source/main/analyze.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/analyze.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -221,6 +221,9 @@
void CommandForeach(cString cur_string, tList<cAnalyzeCommand> & clist);
void CommandForRange(cString cur_string, tList<cAnalyzeCommand> & clist);
+private:
+ // disabled copy constructor.
+ cAnalyze(const cAnalyze &);
public:
cAnalyze(cString filename, cEnvironment* = NULL);
~cAnalyze();
Modified: trunk/source/main/analyze_command.hh
===================================================================
--- trunk/source/main/analyze_command.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/analyze_command.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -21,6 +21,9 @@
protected:
cString command;
cString args;
+private:
+ // disabled copy constructor.
+ cAnalyzeCommand(const cAnalyzeCommand &);
public:
cAnalyzeCommand(const cString & _command, const cString & _args)
: command(_command), args(_args) { command.ToUpper(); }
Modified: trunk/source/main/analyze_function.hh
===================================================================
--- trunk/source/main/analyze_function.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/analyze_function.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -28,6 +28,9 @@
private:
cString name;
tList<cAnalyzeCommand> command_list;
+private:
+ // disabled copy constructor.
+ cAnalyzeFunction(const cAnalyzeFunction &);
public:
cAnalyzeFunction(const cString & _name) : name(_name) { ; }
~cAnalyzeFunction() {
Modified: trunk/source/main/avida_triggers.hh
===================================================================
--- trunk/source/main/avida_triggers.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/avida_triggers.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -22,6 +22,9 @@
class cAvidaTriggers : public cEventTriggers {
private:
cStats & stats;
+private:
+ // disabled copy constructor.
+ cAvidaTriggers(const cAvidaTriggers &);
public:
cAvidaTriggers(cStats & _stats) : stats(_stats) { ; }
double GetUpdate() const { return (double) stats.GetUpdate(); }
Modified: trunk/source/main/environment.hh
===================================================================
--- trunk/source/main/environment.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/environment.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -84,6 +84,9 @@
const tArray<double> & resource_count,
const double task_quality,
cReactionResult & result) const;
+private:
+ // disabled copy constructor.
+ cEnvironment(const cEnvironment &);
public:
cEnvironment();
// cEnvironment(const cString & filename);
Modified: trunk/source/main/genebank.hh
===================================================================
--- trunk/source/main/genebank.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/genebank.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -45,6 +45,9 @@
private:
cString GetLabel(int in_size, int in_num);
+private:
+ // disabled copy constructor.
+ cGenebank(const cGenebank &);
public:
cGenebank(cStats & _stats);
~cGenebank();
Modified: trunk/source/main/genotype_batch.hh
===================================================================
--- trunk/source/main/genotype_batch.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/genotype_batch.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -27,6 +27,9 @@
cString name;
bool is_lineage;
bool is_aligned;
+private:
+ // disabled copy constructor.
+ cGenotypeBatch(const cGenotypeBatch &);
public:
cGenotypeBatch() : name(""), is_lineage(false), is_aligned(false) { ; }
~cGenotypeBatch() { ; }
Modified: trunk/source/main/landscape.hh
===================================================================
--- trunk/source/main/landscape.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/landscape.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -93,6 +93,9 @@
double TestMutPair(cGenome & mod_genome, int line1, int line2,
const cInstruction & mut1, const cInstruction & mut2, std::ostream & fp);
+private:
+ // disabled copy constructor.
+ cLandscape(const cLandscape &);
public:
cLandscape(const cGenome & in_genome, const cInstSet & in_inst_set);
~cLandscape();
Modified: trunk/source/main/reaction.hh
===================================================================
--- trunk/source/main/reaction.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/reaction.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -29,6 +29,9 @@
tList<cReactionProcess> process_list;
tList<cReactionRequisite> requisite_list;
bool active;
+private:
+ // disabled copy constructor.
+ cReaction(const cReaction &);
public:
cReaction(const cString & _name, int _id);
~cReaction();
Modified: trunk/source/main/reaction_requisite.hh
===================================================================
--- trunk/source/main/reaction_requisite.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/reaction_requisite.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -19,6 +19,9 @@
tList<cReaction> prior_noreaction_list;
int min_task_count;
int max_task_count;
+private:
+ // disabled copy constructor.
+ cReactionRequisite(const cReactionRequisite &);
public:
cReactionRequisite();
~cReactionRequisite();
Modified: trunk/source/main/task_lib.hh
===================================================================
--- trunk/source/main/task_lib.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/main/task_lib.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -43,6 +43,9 @@
REQ_NEIGHBOR_OUTPUT=2,
UNUSED_REQ_C=4,
UNUSED_REQ_D=8 };
+private:
+ // disabled copy constructor.
+ cTaskLib(const cTaskLib &);
public:
cTaskLib();
~cTaskLib();
Modified: trunk/source/tools/data_file_manager.hh
===================================================================
--- trunk/source/tools/data_file_manager.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/tools/data_file_manager.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -38,6 +38,9 @@
cDataFile * InternalFind(const cString & name);
+private:
+ // disabled copy constructor.
+ cDataFileManager(const cDataFileManager &);
public:
cDataFileManager() { ; }
~cDataFileManager();
Modified: trunk/source/tools/help_manager.hh
===================================================================
--- trunk/source/tools/help_manager.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/tools/help_manager.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -32,6 +32,9 @@
// Private methods...
cHelpType * GetType(const cString type_name);
+private:
+ // disabled copy constructor.
+ cHelpManager(const cHelpManager &);
public:
cHelpManager() : last_entry(NULL), verbose (false) { ; }
~cHelpManager() { while (type_list.GetSize() > 0) delete type_list.Pop(); }
Modified: trunk/source/tools/help_type.hh
===================================================================
--- trunk/source/tools/help_type.hh 2005-07-22 18:10:07 UTC (rev 247)
+++ trunk/source/tools/help_type.hh 2005-07-22 18:10:53 UTC (rev 248)
@@ -28,6 +28,9 @@
tList<cHelpEntry> entry_list;
cHelpManager * manager;
int num_entries;
+private:
+ // disabled copy constructor.
+ cHelpType(const cHelpType &);
public:
cHelpType(const cString & _name, cHelpManager * _manager)
: name(_name), manager(_manager), num_entries(0) { ; }
More information about the Avida-cvs
mailing list