[Avida-cvs] [Avida2-svn] r296 - in branches/brysonda: . Avida2.xcodeproj source/bindings/Boost.Python source/cpu source/main source/third-party/yaktest source/tools
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Sun Aug 28 11:31:58 PDT 2005
Author: brysonda
Date: 2005-08-28 14:31:57 -0400 (Sun, 28 Aug 2005)
New Revision: 296
Modified:
branches/brysonda/Avida2.xcodeproj/project.pbxproj
branches/brysonda/CMakeLists.txt
branches/brysonda/source/bindings/Boost.Python/phenotype.pyste
branches/brysonda/source/cpu/hardware_smt.cc
branches/brysonda/source/cpu/hardware_smt.h
branches/brysonda/source/main/genotype.cc
branches/brysonda/source/main/inject_genotype.cc
branches/brysonda/source/third-party/yaktest/cTestCase.hh
branches/brysonda/source/tools/functions.hh
Log:
Some Xcode2.2-gcc4.0 related fixes, though incomplete. Switched back fully to gcc-3.3 for Avida-ED. Fixed cPhenotype pyste file. Avida-ED works.
Modified: branches/brysonda/Avida2.xcodeproj/project.pbxproj
===================================================================
--- branches/brysonda/Avida2.xcodeproj/project.pbxproj 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/Avida2.xcodeproj/project.pbxproj 2005-08-28 18:31:57 UTC (rev 296)
@@ -604,6 +604,7 @@
70CD47F0089692AE0070D2DF /* tVector.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tVector.pyste; sourceTree = "<group>"; };
70CD482C089702880070D2DF /* Avida-ED-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Avida-ED-Info.plist"; sourceTree = "<group>"; };
70FB868608BFA02D00BDF589 /* tHashTable.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tHashTable.hh; sourceTree = "<group>"; };
+ 70FB86A908BFAFEC00BDF589 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
DCC30D300762539B008F7A48 /* 4stack_head.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = 4stack_head.pyste; sourceTree = "<group>"; };
DCC30D310762539B008F7A48 /* A.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = A.hh; sourceTree = "<group>"; };
DCC30D320762539B008F7A48 /* A.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = A.pyste; sourceTree = "<group>"; };
@@ -1674,6 +1675,7 @@
isa = PBXGroup;
children = (
DCC30C670762539A008F7A48 /* Source */,
+ 70FB86A908BFAFEC00BDF589 /* CMakeLists.txt */,
DCC3164E07626CF3008F7A48 /* Products */,
70658C59085DF67D00486BED /* libncurses.5.4.dylib */,
703F684207B437B800C1CA76 /* status.xml */,
Modified: branches/brysonda/CMakeLists.txt
===================================================================
--- branches/brysonda/CMakeLists.txt 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/CMakeLists.txt 2005-08-28 18:31:57 UTC (rev 296)
@@ -15,7 +15,7 @@
# - release (Release)
# - release with debug info (RelWithDebInfo)
SET(CMAKE_CXX_FLAGS_DEBUG
- "-g ${COMPILER_WARNING_FLAGS} -pedantic -DDEBUG"
+ "-g ${COMPILER_WARNING_FLAGS} -DDEBUG"
CACHE STRING "Flags used by the compiler during debug builds.")
SET(CMAKE_CXX_FLAGS_MINSIZEREL
"-Os -DNDEBUG"
@@ -24,7 +24,7 @@
"-O3 -ffast-math -DNDEBUG"
CACHE STRING "Flags used by the compiler during release builds.")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
- "-O2 -ffast-math -g ${COMPILER_WARNING_FLAGS} -pedantic -DDEBUG"
+ "-O2 -ffast-math -g ${COMPILER_WARNING_FLAGS} -DDEBUG"
CACHE STRING "Flags used by the compiler during release builds.")
# Four types of c compilations:
@@ -33,7 +33,7 @@
# - release (Release)
# - release with debug info (RelWithDebInfo)
SET(CMAKE_C_FLAGS_DEBUG
- "-g ${COMPILER_WARNING_FLAGS} -pedantic -DDEBUG"
+ "-g ${COMPILER_WARNING_FLAGS} -DDEBUG"
CACHE STRING "Flags used by the compiler during debug builds.")
SET(CMAKE_C_FLAGS_MINSIZEREL
"-Os -DNDEBUG"
@@ -42,7 +42,7 @@
"-O3 -ffast-math -DNDEBUG"
CACHE STRING "Flags used by the compiler during release builds.")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO
- "-O2 -ffast-math -g ${COMPILER_WARNING_FLAGS} -pedantic -DDEBUG"
+ "-O2 -ffast-math -g ${COMPILER_WARNING_FLAGS} -DDEBUG"
CACHE STRING "Flags used by the compiler during release builds.")
# By default, show all build commands.
Modified: branches/brysonda/source/bindings/Boost.Python/phenotype.pyste
===================================================================
--- branches/brysonda/source/bindings/Boost.Python/phenotype.pyste 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/source/bindings/Boost.Python/phenotype.pyste 2005-08-28 18:31:57 UTC (rev 296)
@@ -29,6 +29,7 @@
exclude(cPhenotype.ParentCrossNum)
exclude(cPhenotype.CopyTrue)
exclude(cPhenotype.DivideSex)
+exclude(cPhenotype.MateSelectID)
exclude(cPhenotype.CrossNum)
exclude(cPhenotype.ChildFertile)
exclude(cPhenotype.IsMultiThread)
Modified: branches/brysonda/source/cpu/hardware_smt.cc
===================================================================
--- branches/brysonda/source/cpu/hardware_smt.cc 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/source/cpu/hardware_smt.cc 2005-08-28 18:31:57 UTC (rev 296)
@@ -444,6 +444,11 @@
}
+// DDD
+int cHardwareSMT::FindMemorySpaceLabel(int default_mem)
+{
+ return default_mem;
+}
/////////////////////////////////////////////////////////////////////////
Modified: branches/brysonda/source/cpu/hardware_smt.h
===================================================================
--- branches/brysonda/source/cpu/hardware_smt.h 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/source/cpu/hardware_smt.h 2005-08-28 18:31:57 UTC (rev 296)
@@ -168,14 +168,14 @@
// -------- Memory Manipulation --------}
cCPUMemory& GetMemory() { return m_mem_array[0]; }
- const cCPUMemory & GetMemory() const { return m_mem_array[0]; }
- cCPUMemory & cHardwareSMT::GetMemory(int mem_space)
+ const cCPUMemory& GetMemory() const { return m_mem_array[0]; }
+ cCPUMemory& GetMemory(int mem_space)
{
if(mem_space >= m_mem_array.GetSize())
mem_space %= m_mem_array.GetSize();
return m_mem_array[mem_space];
}
- const cCPUMemory & cHardwareSMT::GetMemory(int mem_space) const
+ const cCPUMemory& GetMemory(int mem_space) const
{
if(mem_space >= m_mem_array.GetSize())
mem_space %= m_mem_array.GetSize();
Modified: branches/brysonda/source/main/genotype.cc
===================================================================
--- branches/brysonda/source/main/genotype.cc 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/source/main/genotype.cc 2005-08-28 18:31:57 UTC (rev 296)
@@ -113,7 +113,7 @@
assert( tmp_sum_merit.Sum() >= 0 && tmp_sum_fitness.Sum() >= 0 );
return ret_value;
-};
+}
void cGenotype::SetParent(cGenotype * parent, cGenotype * parent2)
{
Modified: branches/brysonda/source/main/inject_genotype.cc
===================================================================
--- branches/brysonda/source/main/inject_genotype.cc 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/source/main/inject_genotype.cc 2005-08-28 18:31:57 UTC (rev 296)
@@ -105,7 +105,7 @@
assert( birth_data.update_born >= -1);
return ret_value;
-};
+}
void cInjectGenotype::SetParent(cInjectGenotype * parent)
{
Modified: branches/brysonda/source/third-party/yaktest/cTestCase.hh
===================================================================
--- branches/brysonda/source/third-party/yaktest/cTestCase.hh 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/source/third-party/yaktest/cTestCase.hh 2005-08-28 18:31:57 UTC (rev 296)
@@ -154,7 +154,7 @@
#endif // WIN32
return false;
}
- };
+ }
//! check the last result for final test results
const cTestResult& lastResult( void ) const;
Modified: branches/brysonda/source/tools/functions.hh
===================================================================
--- branches/brysonda/source/tools/functions.hh 2005-08-26 19:15:08 UTC (rev 295)
+++ branches/brysonda/source/tools/functions.hh 2005-08-28 18:31:57 UTC (rev 296)
@@ -53,7 +53,7 @@
in2 = tmp;
}
-};
+}
inline bool ToggleBool(bool & in_bool)
{
More information about the Avida-cvs
mailing list