[Avida-SVN] r1374 - in development: Avida.xcodeproj source source/analyze source/classification source/cpu source/drivers source/main source/platform/tcmalloc source/targets/avida source/targets/avida-viewer source/tools source/utils/task_events
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Tue Feb 27 06:11:06 PST 2007
Author: brysonda
Date: 2007-02-27 09:11:06 -0500 (Tue, 27 Feb 2007)
New Revision: 1374
Removed:
development/source/tools/win32_mkdir_hack.hh
Modified:
development/Avida.xcodeproj/project.pbxproj
development/source/analyze/cAnalyze.cc
development/source/classification/cInjectGenotypeQueue.cc
development/source/classification/cSpeciesControl.cc
development/source/cpu/cCPUStack.cc
development/source/cpu/cCPUTestInfo.cc
development/source/cpu/cHardwareCPU.cc
development/source/cpu/cHardwareExperimental.cc
development/source/cpu/cHeadCPU.cc
development/source/cpu/cInstLib.h
development/source/cpu/cTestCPU.cc
development/source/defs.h
development/source/drivers/cDefaultAnalyzeDriver.cc
development/source/drivers/cDefaultRunDriver.cc
development/source/drivers/cDriverManager.cc
development/source/drivers/cFallbackWorldDriver.cc
development/source/main/avida.cc
development/source/main/cEventList.cc
development/source/main/cGenome.h
development/source/main/cInstruction.h
development/source/main/cPopulation.cc
development/source/main/cPopulationInterface.cc
development/source/main/cResourceCount.cc
development/source/main/cStats.cc
development/source/main/cStats.h
development/source/main/cTaskContext.h
development/source/main/cTaskLib.cc
development/source/main/cWorld.cc
development/source/main/cWorld.h
development/source/platform/tcmalloc/pagemap.h
development/source/platform/tcmalloc/spinlock.h
development/source/platform/tcmalloc/tcmalloc-logging.cc
development/source/platform/tcmalloc/tcmalloc-logging.h
development/source/platform/tcmalloc/tcmalloc.cc
development/source/targets/avida-viewer/cAnalyzeScreen.cc
development/source/targets/avida-viewer/cBaseTextWindow.h
development/source/targets/avida-viewer/cTabBox.h
development/source/targets/avida-viewer/cTextViewerAnalyzeDriver.cc
development/source/targets/avida-viewer/cTextViewerDriver.cc
development/source/targets/avida-viewer/cTextWindow.cc
development/source/targets/avida-viewer/cTextWindow.h
development/source/targets/avida-viewer/cView.cc
development/source/targets/avida-viewer/viewer.cc
development/source/targets/avida/primitive.cc
development/source/tools/SConscript
development/source/tools/cDataFile.cc
development/source/tools/cDataFileManager.cc
development/source/tools/cDoubleSum.h
development/source/tools/cFile.cc
development/source/tools/cHistogram.cc
development/source/tools/cHistogram.h
development/source/tools/cIntSum.h
development/source/tools/cMerit.h
development/source/tools/cMessageDisplay.cc
development/source/tools/cRandom.cc
development/source/tools/cRandom.h
development/source/tools/cRunningAverage.cc
development/source/tools/cRunningAverage.h
development/source/tools/cString.cc
development/source/tools/cString.h
development/source/tools/cStringUtil.cc
development/source/tools/cTools.cc
development/source/tools/cUInt.h
development/source/tools/functions.h
development/source/tools/tArray.h
development/source/tools/tBuffer.h
development/source/tools/tHashTable.h
development/source/tools/tManagedPointerArray.h
development/source/tools/tMatrix.h
development/source/tools/tSmartArray.h
development/source/utils/task_events/task_event_gen.old.cc
Log:
Standardize header usage with the C++ standard library headers. Reinstate llabs gcc bug workaround.
Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/Avida.xcodeproj/project.pbxproj 2007-02-27 14:11:06 UTC (rev 1374)
@@ -269,9 +269,6 @@
70DCAC9A097AF754002F8733 /* cTextViewerDriver.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70DCAC6D097AF730002F8733 /* cTextViewerDriver.cc */; };
70DCAC9C097AF7C0002F8733 /* primitive.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70DCAC9B097AF7C0002F8733 /* primitive.cc */; };
70DCACA0097AF7CC002F8733 /* avida.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109C0762539E008F7A48 /* avida.cc */; };
- 70DCACA1097AF7CC002F8733 /* trio.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC3146D076253A1008F7A48 /* trio.c */; };
- 70DCACA2097AF7CC002F8733 /* trionan.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC31471076253A1008F7A48 /* trionan.c */; };
- 70DCACA3097AF7CC002F8733 /* triostr.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC31474076253A1008F7A48 /* triostr.c */; };
70DCACA4097AF7CC002F8733 /* cCodeLabel.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70C1EF4608C393BA00F50912 /* cCodeLabel.cc */; };
70DCACA5097AF7CC002F8733 /* cCPUMemory.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70C1EF5808C3948C00F50912 /* cCPUMemory.cc */; };
70DCACA6097AF7CC002F8733 /* cCPUStack.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70C1EF6108C3954700F50912 /* cCPUStack.cc */; };
@@ -487,7 +484,6 @@
703CA3720A50735B00AB4DB4 /* SConscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SConscript; sourceTree = "<group>"; };
703CA3730A50737700AB4DB4 /* SConscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SConscript; sourceTree = "<group>"; };
703CA3740A50739600AB4DB4 /* SConscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SConscript; sourceTree = "<group>"; };
- 703CA3750A5073BA00AB4DB4 /* SConscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SConscript; sourceTree = "<group>"; };
703CA3760A5073CD00AB4DB4 /* SConscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SConscript; sourceTree = "<group>"; };
703CA3770A50740300AB4DB4 /* SConscript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SConscript; sourceTree = "<group>"; };
703CA3780A50749F00AB4DB4 /* SConstruct */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SConstruct; sourceTree = "<group>"; };
@@ -903,39 +899,6 @@
DCC3109C0762539E008F7A48 /* avida.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida.cc; sourceTree = "<group>"; };
DCC310A90762539E008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
DCC31345076253A0008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
- DCC3143B076253A1008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
- DCC3143C076253A1008F7A48 /* compare.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = compare.c; sourceTree = "<group>"; };
- DCC3144A076253A1008F7A48 /* doc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc.h; sourceTree = "<group>"; };
- DCC3144B076253A1008F7A48 /* doc_dynamic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_dynamic.h; sourceTree = "<group>"; };
- DCC3144C076253A1008F7A48 /* doc_printf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_printf.h; sourceTree = "<group>"; };
- DCC3144D076253A1008F7A48 /* doc_register.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_register.h; sourceTree = "<group>"; };
- DCC3144E076253A1008F7A48 /* doc_scanf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_scanf.h; sourceTree = "<group>"; };
- DCC3144F076253A1008F7A48 /* doc_static.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_static.h; sourceTree = "<group>"; };
- DCC31450076253A1008F7A48 /* footer.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = footer.html; sourceTree = "<group>"; };
- DCC31451076253A1008F7A48 /* header.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = header.html; sourceTree = "<group>"; };
- DCC31452076253A1008F7A48 /* trio.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = trio.cfg; sourceTree = "<group>"; };
- DCC31453076253A1008F7A48 /* trio.css */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = trio.css; sourceTree = "<group>"; };
- DCC31454076253A1008F7A48 /* example.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = example.c; sourceTree = "<group>"; };
- DCC31461076253A1008F7A48 /* group___dynamic_strings.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___dynamic_strings.html; sourceTree = "<group>"; };
- DCC31462076253A1008F7A48 /* group___printf.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___printf.html; sourceTree = "<group>"; };
- DCC31463076253A1008F7A48 /* group___scanf.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___scanf.html; sourceTree = "<group>"; };
- DCC31464076253A1008F7A48 /* group___special_quantities.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___special_quantities.html; sourceTree = "<group>"; };
- DCC31465076253A1008F7A48 /* group___static_strings.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___static_strings.html; sourceTree = "<group>"; };
- DCC31466076253A1008F7A48 /* group___user_defined.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___user_defined.html; sourceTree = "<group>"; };
- DCC31467076253A1008F7A48 /* index.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
- DCC31468076253A1008F7A48 /* modules.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = modules.html; sourceTree = "<group>"; };
- DCC31469076253A1008F7A48 /* trio.css */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = trio.css; sourceTree = "<group>"; };
- DCC3146B076253A1008F7A48 /* regression.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = regression.c; sourceTree = "<group>"; };
- DCC3146C076253A1008F7A48 /* strio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = strio.h; sourceTree = "<group>"; };
- DCC3146D076253A1008F7A48 /* trio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = trio.c; sourceTree = "<group>"; };
- DCC3146E076253A1008F7A48 /* trio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = trio.h; sourceTree = "<group>"; };
- DCC3146F076253A1008F7A48 /* trio.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = trio.pri; sourceTree = "<group>"; };
- DCC31470076253A1008F7A48 /* triodef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = triodef.h; sourceTree = "<group>"; };
- DCC31471076253A1008F7A48 /* trionan.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = trionan.c; sourceTree = "<group>"; };
- DCC31472076253A1008F7A48 /* trionan.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = trionan.h; sourceTree = "<group>"; };
- DCC31473076253A1008F7A48 /* triop.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = triop.h; sourceTree = "<group>"; };
- DCC31474076253A1008F7A48 /* triostr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = triostr.c; sourceTree = "<group>"; };
- DCC31475076253A1008F7A48 /* triostr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = triostr.h; sourceTree = "<group>"; };
DCC31547076253A4008F7A48 /* cCycleCheck.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCycleCheck.cc; sourceTree = "<group>"; };
DCC3154A076253A4008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
DCC31585076253A4008F7A48 /* recursive_tests_decl_hdrs.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = recursive_tests_decl_hdrs.hh; sourceTree = "<group>"; };
@@ -947,7 +910,6 @@
DCC315AE076253A5008F7A48 /* tUnitTestSuiteRecurser.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tUnitTestSuiteRecurser.hh; sourceTree = "<group>"; };
DCC315B0076253A5008F7A48 /* tVerifierSuite.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tVerifierSuite.hh; sourceTree = "<group>"; };
DCC315B1076253A5008F7A48 /* tVerifierSuiteRecurser.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tVerifierSuiteRecurser.hh; sourceTree = "<group>"; };
- DCC315B5076253A5008F7A48 /* win32_mkdir_hack.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = win32_mkdir_hack.hh; sourceTree = "<group>"; };
DCC315C1076253A5008F7A48 /* hist_map.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hist_map.cc; sourceTree = "<group>"; };
DCC315C2076253A5008F7A48 /* hist_map2.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hist_map2.cc; sourceTree = "<group>"; };
DCC315C3076253A5008F7A48 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
@@ -1517,68 +1479,10 @@
children = (
DCC31345076253A0008F7A48 /* CMakeLists.txt */,
703CA3740A50739600AB4DB4 /* SConscript */,
- DCC31429076253A1008F7A48 /* trio */,
);
path = "third-party";
sourceTree = "<group>";
};
- DCC31429076253A1008F7A48 /* trio */ = {
- isa = PBXGroup;
- children = (
- 703CA3750A5073BA00AB4DB4 /* SConscript */,
- DCC3143B076253A1008F7A48 /* CMakeLists.txt */,
- DCC3143C076253A1008F7A48 /* compare.c */,
- DCC3143D076253A1008F7A48 /* doc */,
- DCC31454076253A1008F7A48 /* example.c */,
- DCC31455076253A1008F7A48 /* html */,
- DCC3146B076253A1008F7A48 /* regression.c */,
- DCC3146C076253A1008F7A48 /* strio.h */,
- DCC3146D076253A1008F7A48 /* trio.c */,
- DCC3146E076253A1008F7A48 /* trio.h */,
- DCC3146F076253A1008F7A48 /* trio.pri */,
- DCC31470076253A1008F7A48 /* triodef.h */,
- DCC31471076253A1008F7A48 /* trionan.c */,
- DCC31472076253A1008F7A48 /* trionan.h */,
- DCC31473076253A1008F7A48 /* triop.h */,
- DCC31474076253A1008F7A48 /* triostr.c */,
- DCC31475076253A1008F7A48 /* triostr.h */,
- );
- path = trio;
- sourceTree = "<group>";
- };
- DCC3143D076253A1008F7A48 /* doc */ = {
- isa = PBXGroup;
- children = (
- DCC3144A076253A1008F7A48 /* doc.h */,
- DCC3144B076253A1008F7A48 /* doc_dynamic.h */,
- DCC3144C076253A1008F7A48 /* doc_printf.h */,
- DCC3144D076253A1008F7A48 /* doc_register.h */,
- DCC3144E076253A1008F7A48 /* doc_scanf.h */,
- DCC3144F076253A1008F7A48 /* doc_static.h */,
- DCC31450076253A1008F7A48 /* footer.html */,
- DCC31451076253A1008F7A48 /* header.html */,
- DCC31452076253A1008F7A48 /* trio.cfg */,
- DCC31453076253A1008F7A48 /* trio.css */,
- );
- path = doc;
- sourceTree = "<group>";
- };
- DCC31455076253A1008F7A48 /* html */ = {
- isa = PBXGroup;
- children = (
- DCC31461076253A1008F7A48 /* group___dynamic_strings.html */,
- DCC31462076253A1008F7A48 /* group___printf.html */,
- DCC31463076253A1008F7A48 /* group___scanf.html */,
- DCC31464076253A1008F7A48 /* group___special_quantities.html */,
- DCC31465076253A1008F7A48 /* group___static_strings.html */,
- DCC31466076253A1008F7A48 /* group___user_defined.html */,
- DCC31467076253A1008F7A48 /* index.html */,
- DCC31468076253A1008F7A48 /* modules.html */,
- DCC31469076253A1008F7A48 /* trio.css */,
- );
- path = html;
- sourceTree = "<group>";
- };
DCC314D8076253A2008F7A48 /* tools */ = {
isa = PBXGroup;
children = (
@@ -1686,7 +1590,6 @@
DCC315AE076253A5008F7A48 /* tUnitTestSuiteRecurser.hh */,
DCC315B0076253A5008F7A48 /* tVerifierSuite.hh */,
DCC315B1076253A5008F7A48 /* tVerifierSuiteRecurser.hh */,
- DCC315B5076253A5008F7A48 /* win32_mkdir_hack.hh */,
700E28CF0859FFD700CF158A /* tObjectFactory.h */,
70B3984E0947B29D0018F09D /* tManagedPointerArray.h */,
7054A11E09A7BEFC00038658 /* cThread.h */,
@@ -2045,9 +1948,6 @@
buildActionMask = 2147483647;
files = (
70DCACA0097AF7CC002F8733 /* avida.cc in Sources */,
- 70DCACA1097AF7CC002F8733 /* trio.c in Sources */,
- 70DCACA2097AF7CC002F8733 /* trionan.c in Sources */,
- 70DCACA3097AF7CC002F8733 /* triostr.c in Sources */,
70DCACA4097AF7CC002F8733 /* cCodeLabel.cc in Sources */,
70DCACA5097AF7CC002F8733 /* cCPUMemory.cc in Sources */,
70DCACA6097AF7CC002F8733 /* cCPUStack.cc in Sources */,
Modified: development/source/analyze/cAnalyze.cc
===================================================================
--- development/source/analyze/cAnalyze.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/analyze/cAnalyze.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -68,14 +68,11 @@
#include "tHashTable.h"
#include "cWorld.h"
#include "cWorldDriver.h"
-#ifdef WIN32
-# include "win32_mkdir_hack.hh"
-#endif
#include "defs.h"
+#include <cerrno>
extern "C" {
-#include <errno.h>
#include <sys/stat.h>
}
Modified: development/source/classification/cInjectGenotypeQueue.cc
===================================================================
--- development/source/classification/cInjectGenotypeQueue.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/classification/cInjectGenotypeQueue.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -27,7 +27,7 @@
#include "cInjectGenotype.h"
-#include <assert.h>
+#include <cassert>
cInjectGenotypeQueue::cInjectGenotypeQueue()
Modified: development/source/classification/cSpeciesControl.cc
===================================================================
--- development/source/classification/cSpeciesControl.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/classification/cSpeciesControl.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -32,7 +32,7 @@
#include "cStats.h"
#include "cWorld.h"
-#include <assert.h>
+#include <cassert>
void cSpeciesControl::Remove(cSpecies & in_species)
{
Modified: development/source/cpu/cCPUStack.cc
===================================================================
--- development/source/cpu/cCPUStack.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/cpu/cCPUStack.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -25,7 +25,7 @@
#include "cCPUStack.h"
-#include <assert.h>
+#include <cassert>
#include "cString.h"
using namespace std;
Modified: development/source/cpu/cCPUTestInfo.cc
===================================================================
--- development/source/cpu/cCPUTestInfo.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/cpu/cCPUTestInfo.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -29,7 +29,7 @@
#include "cOrganism.h"
#include "cPhenotype.h"
-#include <assert.h>
+#include <cassert>
cCPUTestInfo::cCPUTestInfo(int max_tests)
: generation_tests(max_tests) // These vars not reset on Clear()
Modified: development/source/cpu/cHardwareCPU.cc
===================================================================
--- development/source/cpu/cHardwareCPU.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/cpu/cHardwareCPU.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -45,7 +45,7 @@
#include "cWorld.h"
#include "tInstLibEntry.h"
-#include <limits.h>
+#include <climits>
#include <fstream>
using namespace std;
@@ -1789,7 +1789,6 @@
int label_pos = search_head.GetPosition();
search_head++;
int size_matched = 0;
- bool match = true;
while ( size_matched < GetLabel().GetSize() )
{
if ( !m_inst_set->IsNop(search_head.GetInst()) ) break;
Modified: development/source/cpu/cHardwareExperimental.cc
===================================================================
--- development/source/cpu/cHardwareExperimental.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/cpu/cHardwareExperimental.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -45,7 +45,7 @@
#include "cWorld.h"
#include "tInstLibEntry.h"
-#include <limits.h>
+#include <climits>
#include <fstream>
using namespace std;
@@ -446,7 +446,6 @@
if (search_label.GetSize() == 0) return ip;
const cGenome& memory = ip.GetMemory();
- int start = ip.GetPosition();
int pos = 0;
while (pos < memory.GetSize()) {
Modified: development/source/cpu/cHeadCPU.cc
===================================================================
--- development/source/cpu/cHeadCPU.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/cpu/cHeadCPU.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -30,7 +30,7 @@
#include "cInstruction.h"
#include "cStringUtil.h"
-#include <assert.h>
+#include <cassert>
void cHeadCPU::Adjust()
Modified: development/source/cpu/cInstLib.h
===================================================================
--- development/source/cpu/cInstLib.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/cpu/cInstLib.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -53,6 +53,7 @@
public:
cInstLib(int size, const cInstruction inst_error, const cInstruction inst_default)
: m_size(size), m_inst_error(inst_error), m_inst_default(inst_default) { ; }
+ virtual ~cInstLib() { ; }
inline int GetSize() const { return m_size; }
Modified: development/source/cpu/cTestCPU.cc
===================================================================
--- development/source/cpu/cTestCPU.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/cpu/cTestCPU.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -179,7 +179,7 @@
if(i >= (int)(*m_res)[which].second.size()) {
m_resource_count.Set(i, 0.0);
} else {
- double temp = (*m_res)[which].second[i];
+ // @DMB - unused - double temp = (*m_res)[which].second[i];
m_resource_count.Set(i, (*m_res)[which].second[i]);
}
}
Modified: development/source/defs.h
===================================================================
--- development/source/defs.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/defs.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -29,10 +29,7 @@
#define VERSION "2.7.0"
#define VERSION_TAG "Jedi Knight"
-// -= Various view modes
-// #define VIEW_ANSI
-
// -= Configurable Features
#ifndef BREAKPOINTS
#define BREAKPOINTS 0
@@ -56,44 +53,15 @@
// #define SPECIES_TEST
-// -= Compiler Compatability Stuff
-#define LONGINT long int
-
-
-////// Don't change anything below this line. /////
-
-#ifdef VIEW_ANSI
-#define PLATFORM_WINDOWS // enable to compile for Win32 console
-#define MSVC_COMPILER // enable to compile with Microsoft VC++
-#endif
-
// Finally, if we have turned off Assertions, define NDEBUG
#ifndef DEBUG
-#ifndef NDEBUG
-#define NDEBUG
+# ifndef NDEBUG
+# define NDEBUG
+# endif
#endif
-#endif
-#ifdef PLATFORM_WINDOWS
- #ifdef UINT // Some modules will not compile w/out this (e.g. b_struct2)
- #undef UNIT
- #endif
-
- #include <windows.h> // Defines, prototypes, etc. for
-#endif
-
-#ifdef MSVC_COMPILER
- #ifdef _DEBUG // VC++ debug define
- #define DEBUG
- #endif
-
- #ifndef _WINDEF_
- #include <string.h>
- #endif
-#endif
-
#ifndef NULL
- #define NULL 0
+# define NULL 0
#endif
const int MIN_CREATURE_SIZE = 8;
Modified: development/source/drivers/cDefaultAnalyzeDriver.cc
===================================================================
--- development/source/drivers/cDefaultAnalyzeDriver.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/drivers/cDefaultAnalyzeDriver.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -28,7 +28,7 @@
#include "cDriverManager.h"
#include "cWorld.h"
-#include <stdlib.h>
+#include <cstdlib>
#include <iostream>
using namespace std;
Modified: development/source/drivers/cDefaultRunDriver.cc
===================================================================
--- development/source/drivers/cDefaultRunDriver.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/drivers/cDefaultRunDriver.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -37,7 +37,7 @@
#include "cString.h"
#include "cWorld.h"
-#include <stdlib.h>
+#include <cstdlib>
#include <iostream>
#include <iomanip>
Modified: development/source/drivers/cDriverManager.cc
===================================================================
--- development/source/drivers/cDriverManager.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/drivers/cDriverManager.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -28,8 +28,8 @@
#include "cAvidaDriver.h"
#include "cWorldDriver.h"
-#include <assert.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstdlib>
cDriverManager* cDriverManager::m_dm = NULL;
Modified: development/source/drivers/cFallbackWorldDriver.cc
===================================================================
--- development/source/drivers/cFallbackWorldDriver.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/drivers/cFallbackWorldDriver.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,7 +26,7 @@
#include "cString.h"
-#include <stdlib.h>
+#include <cstdlib>
#include <iostream>
using namespace std;
Modified: development/source/main/avida.cc
===================================================================
--- development/source/main/avida.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/avida.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -32,8 +32,8 @@
#endif
#include <iostream>
-#include <signal.h>
-#include <stdio.h>
+#include <csignal>
+#include <cstdio>
using namespace std;
Modified: development/source/main/cEventList.cc
===================================================================
--- development/source/main/cEventList.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cEventList.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -32,7 +32,7 @@
#include "cString.h"
#include "cWorld.h"
-#include <float.h> // for DBL_MIN
+#include <cfloat> // for DBL_MIN
#include <iostream>
using namespace std;
Modified: development/source/main/cGenome.h
===================================================================
--- development/source/main/cGenome.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cGenome.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,7 +26,7 @@
#ifndef cGenome_h
#define cGenome_h
-#include <assert.h>
+#include <cassert>
#ifndef cInstruction_h
#include "cInstruction.h"
Modified: development/source/main/cInstruction.h
===================================================================
--- development/source/main/cInstruction.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cInstruction.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,7 +26,7 @@
#ifndef cInstruction_h
#define cInstruction_h
-#include <assert.h>
+#include <cassert>
#ifndef defs_h
#include "defs.h"
Modified: development/source/main/cPopulation.cc
===================================================================
--- development/source/main/cPopulation.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cPopulation.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -56,9 +56,9 @@
#include <algorithm>
#include <set>
-#include <float.h>
-#include <math.h>
-#include <limits.h>
+#include <cfloat>
+#include <cmath>
+#include <climits>
using namespace std;
Modified: development/source/main/cPopulationInterface.cc
===================================================================
--- development/source/main/cPopulationInterface.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cPopulationInterface.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -34,7 +34,7 @@
#include "cStats.h"
#include "cTestCPU.h"
-#include <assert.h>
+#include <cassert>
#ifndef NULL
#define NULL 0
Modified: development/source/main/cResourceCount.cc
===================================================================
--- development/source/main/cResourceCount.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cResourceCount.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -27,9 +27,7 @@
#include "nGeometry.h"
-extern "C" {
-#include <math.h>
-}
+#include <cmath>
using namespace std;
Modified: development/source/main/cStats.cc
===================================================================
--- development/source/main/cStats.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cStats.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -36,8 +36,8 @@
#include "functions.h"
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
cStats::cStats(cWorld* world)
Modified: development/source/main/cStats.h
===================================================================
--- development/source/main/cStats.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cStats.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,7 +26,7 @@
#ifndef cStats_h
#define cStats_h
-#include <assert.h>
+#include <cassert>
#include <fstream>
#include <iostream>
Modified: development/source/main/cTaskContext.h
===================================================================
--- development/source/main/cTaskContext.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cTaskContext.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -84,12 +84,12 @@
inline const tBuffer<int>& GetOutputBuffer() { return m_output_buffer; }
inline const tList<tBuffer<int> >& GetNeighborhoodInputBuffers() { return m_other_input_buffers; }
inline const tList<tBuffer<int> >& GetNeighborhoodOutputBuffers() { return m_other_output_buffers; }
- inline bool NetIsValid() { return m_net_valid; }
- inline int GetNetCompleted() { return m_net_completed; }
+ inline bool NetIsValid() const { return m_net_valid; }
+ inline int GetNetCompleted() const { return m_net_completed; }
inline tBuffer<int>* GetReceivedMessages() { return m_received_messages; }
- inline int GetLogicId() { return m_logic_id; }
+ inline int GetLogicId() const { return m_logic_id; }
inline void SetLogicId(int v) { m_logic_id = v; }
- inline bool GetOnDivide() { return m_on_divide; }
+ inline bool GetOnDivide() const { return m_on_divide; }
inline void SetTaskEntry(cTaskEntry* in_entry) { m_task_entry = in_entry; }
inline cTaskEntry* GetTaskEntry() { return m_task_entry; }
Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cTaskLib.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -30,9 +30,9 @@
#include "tHashTable.h"
#include "cTaskState.h"
-#include <stdlib.h>
-#include <math.h>
-#include <limits.h>
+#include <cstdlib>
+#include <cmath>
+#include <climits>
// Various workarounds for Visual Studio shortcomings
#ifdef WIN32
@@ -490,10 +490,9 @@
{
const tBuffer<int>& input_buffer = ctx.GetInputBuffer();
const int test_output = ctx.GetOutputBuffer()[0];
- const int logic_id = ctx.GetLogicId();
for (int i = 0; i < input_buffer.GetNumStored(); i++) {
if (input_buffer[i] == test_output) {
- assert(logic_id == 170 || logic_id == 204 || logic_id == 240);
+ assert(ctx.GetLogicId() == 170 || ctx.GetLogicId() == 204 || ctx.GetLogicId() == 240);
return 1.0;
}
}
@@ -1918,7 +1917,7 @@
double quality = 0.0;
const cArgContainer& args = ctx.GetTaskEntry()->GetArguments();
- long long diff = llabs((long long)args.GetInt(0) - ctx.GetOutputBuffer()[0]);
+ long long diff = ::llabs((long long)args.GetInt(0) - ctx.GetOutputBuffer()[0]);
int threshold = args.GetInt(1);
if (threshold < 0 || diff <= threshold) { // Negative threshold == infinite
@@ -2139,7 +2138,7 @@
for (int i = 0; i < input_size; i ++) {
for (int j = 0; j < input_size; j ++) {
if (i == j) continue;
- long long cur_diff = llabs((long long)(input_buffer[i] * input_buffer[j]) - test_output);
+ long long cur_diff = ::llabs((long long)(input_buffer[i] * input_buffer[j]) - test_output);
if (cur_diff < diff) diff = cur_diff;
}
}
@@ -2183,7 +2182,7 @@
for (int i = 0; i < input_size; i ++) {
for (int j = 0; j < input_size; j ++) {
if (i == j || input_buffer[j] == 0) continue;
- long long cur_diff = llabs((long long)(input_buffer[i] / input_buffer[j]) - test_output);
+ long long cur_diff = ::llabs((long long)(input_buffer[i] / input_buffer[j]) - test_output);
if (cur_diff < diff) diff = cur_diff;
}
}
@@ -2225,7 +2224,7 @@
long long diff = ((long long)INT_MAX + 1) * 2;
for (int i = 0; i < input_size; i ++) {
- long long cur_diff = llabs((long long)(log(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+ long long cur_diff = ::llabs((long long)(log(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
if (cur_diff < diff) diff = cur_diff;
}
@@ -2267,7 +2266,7 @@
long long diff = ((long long)INT_MAX + 1) * 2;
for (int i = 0; i < input_size; i ++) {
- long long cur_diff = llabs((long long)(log2(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+ long long cur_diff = ::llabs((long long)(log2(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
if (cur_diff < diff) diff = cur_diff;
}
@@ -2309,7 +2308,7 @@
long long diff = ((long long)INT_MAX + 1) * 2;
for (int i = 0; i < input_size; i ++) {
- long long cur_diff = llabs((long long)(log10(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
+ long long cur_diff = ::llabs((long long)(log10(fabs(double(input_buffer[i] ? input_buffer[i] : 1)))) - test_output);
if (cur_diff < diff) diff = cur_diff;
}
@@ -2351,7 +2350,7 @@
long long diff = ((long long)INT_MAX + 1) * 2;
for (int i = 0; i < input_size; i ++) {
- long long cur_diff = llabs((long long)(sqrt(fabs(double(input_buffer[i])))) - test_output);
+ long long cur_diff = ::llabs((long long)(sqrt(fabs(double(input_buffer[i])))) - test_output);
if (cur_diff < diff) diff = cur_diff;
}
Modified: development/source/main/cWorld.cc
===================================================================
--- development/source/main/cWorld.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cWorld.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -37,7 +37,7 @@
#include "cTools.h"
#include "cFallbackWorldDriver.h"
-#include <assert.h>
+#include <cassert>
cWorld::~cWorld()
Modified: development/source/main/cWorld.h
===================================================================
--- development/source/main/cWorld.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/main/cWorld.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -45,7 +45,7 @@
#endif
-#include <assert.h>
+#include <cassert>
class cActionLibrary;
class cAnalyze;
Modified: development/source/platform/tcmalloc/pagemap.h
===================================================================
--- development/source/platform/tcmalloc/pagemap.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/platform/tcmalloc/pagemap.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -79,7 +79,7 @@
#include <sys/types.h>
#endif
-#include <string.h>
+#include <cstring>
// Single-level array
template <int BITS>
Modified: development/source/platform/tcmalloc/spinlock.h
===================================================================
--- development/source/platform/tcmalloc/spinlock.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/platform/tcmalloc/spinlock.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -59,7 +59,7 @@
#include "tcmalloc-config.h"
-#include <time.h> /* For nanosleep() */
+#include <ctime> /* For nanosleep() */
#include <sched.h> /* For sched_yield() */
#if HAVE(STDINT_H)
@@ -70,7 +70,7 @@
#include <sys/types.h>
#endif
-#include <stdlib.h> /* for abort() */
+#include <cstdlib> /* for abort() */
#if (PLATFORM(X86) || PLATFORM(PPC)) && COMPILER(GCC)
static void TCMalloc_SlowLock(volatile unsigned int* lockword);
Modified: development/source/platform/tcmalloc/tcmalloc-logging.cc
===================================================================
--- development/source/platform/tcmalloc/tcmalloc-logging.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/platform/tcmalloc/tcmalloc-logging.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -56,9 +56,9 @@
// ---
// Sanjay Ghemawat <opensource at google.com>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdarg>
+#include <cstring>
int TCMallocDebug::level;
Modified: development/source/platform/tcmalloc/tcmalloc-logging.h
===================================================================
--- development/source/platform/tcmalloc/tcmalloc-logging.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/platform/tcmalloc/tcmalloc-logging.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -60,8 +60,8 @@
#define TCMALLOC_INTERNAL_LOGGING_H__
#include "tcmalloc-config.h"
-#include <stdarg.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstdlib>
#include <unistd.h>
//-------------------------------------------------------------------
Modified: development/source/platform/tcmalloc/tcmalloc.cc
===================================================================
--- development/source/platform/tcmalloc/tcmalloc.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/platform/tcmalloc/tcmalloc.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -88,15 +88,15 @@
#include "tcmalloc-config.h"
#include <new>
-#include <stdio.h>
+#include <cstdio>
#include <stddef.h>
#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
#include <pthread.h>
#include <unistd.h>
-#include <errno.h>
-#include <stdarg.h>
+#include <cerrno>
+#include <cstdarg>
#include "tcmalloc-logging.h"
#include "spinlock.h"
Modified: development/source/targets/avida/primitive.cc
===================================================================
--- development/source/targets/avida/primitive.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida/primitive.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -21,7 +21,7 @@
*
*/
-#include <signal.h>
+#include <csignal>
#include "avida.h"
#include "cAvidaConfig.h"
Modified: development/source/targets/avida-viewer/cAnalyzeScreen.cc
===================================================================
--- development/source/targets/avida-viewer/cAnalyzeScreen.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/cAnalyzeScreen.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -22,13 +22,14 @@
#include "cPopulationCell.h"
#include "cOrganism.h"
+#include <csignal>
+
#ifdef WIN32
-#include <process.h>
-#define kill(x,y) exit(0)
+# include <process.h>
+# define kill(x,y) exit(0)
#else
-#include <unistd.h>
+# include <unistd.h>
#endif
-#include <signal.h>
using namespace std;
Modified: development/source/targets/avida-viewer/cBaseTextWindow.h
===================================================================
--- development/source/targets/avida-viewer/cBaseTextWindow.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/cBaseTextWindow.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -8,7 +8,7 @@
#ifndef cBaseTextWindow_h
#define cBaseTextWindow_h
-#include <assert.h>
+#include <cassert>
#ifndef cTools_h
#include "cTools.h"
Modified: development/source/targets/avida-viewer/cTabBox.h
===================================================================
--- development/source/targets/avida-viewer/cTabBox.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/cTabBox.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -109,7 +109,7 @@
// Draw tabs...
int offset = 2;
- int active_offset;
+ int active_offset = 0;
for (int tab_id = 0; tab_id < tabname_array.GetSize(); tab_id++) {
const cString & cur_name = tabname_array[tab_id];
const int tab_width = cur_name.GetSize() + 4;
Modified: development/source/targets/avida-viewer/cTextViewerAnalyzeDriver.cc
===================================================================
--- development/source/targets/avida-viewer/cTextViewerAnalyzeDriver.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/cTextViewerAnalyzeDriver.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -38,7 +38,7 @@
#include "cString.h"
#include "cWorld.h"
-#include <stdlib.h>
+#include <cstdlib>
using namespace std;
Modified: development/source/targets/avida-viewer/cTextViewerDriver.cc
===================================================================
--- development/source/targets/avida-viewer/cTextViewerDriver.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/cTextViewerDriver.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -37,7 +37,7 @@
#include "cView.h"
#include "cWorld.h"
-#include <stdlib.h>
+#include <cstdlib>
using namespace std;
Modified: development/source/targets/avida-viewer/cTextWindow.cc
===================================================================
--- development/source/targets/avida-viewer/cTextWindow.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/cTextWindow.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -7,7 +7,7 @@
#include "cTextWindow.h"
-#include <stdlib.h>
+#include <cstdlib>
using namespace std;
Modified: development/source/targets/avida-viewer/cTextWindow.h
===================================================================
--- development/source/targets/avida-viewer/cTextWindow.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/cTextWindow.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -20,7 +20,7 @@
#include "cBaseTextWindow.h"
#endif
-#include <signal.h>
+#include <csignal>
#include <cstdarg>
// All colors are defines except black on black:
Modified: development/source/targets/avida-viewer/cView.cc
===================================================================
--- development/source/targets/avida-viewer/cView.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/cView.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -29,14 +29,15 @@
#include "cEnvironmentScreen.h"
#include "cAnalyzeScreen.h"
+#include <csignal>
#include <fstream>
+
#ifdef WIN32
-#include <process.h>
-#define kill(x, y) exit(0)
+# include <process.h>
+# define kill(x, y) exit(0)
#else
-#include <unistd.h>
+# include <unistd.h>
#endif
-#include <signal.h>
using namespace std;
Modified: development/source/targets/avida-viewer/viewer.cc
===================================================================
--- development/source/targets/avida-viewer/viewer.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/targets/avida-viewer/viewer.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -21,7 +21,7 @@
*
*/
-#include <signal.h>
+#include <csignal>
#include "avida.h"
#include "cAvidaConfig.h"
Modified: development/source/tools/SConscript
===================================================================
--- development/source/tools/SConscript 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/SConscript 2007-02-27 14:11:06 UTC (rev 1374)
@@ -4,14 +4,6 @@
misc = ['SConscript']
incs = [
- 'recursive_tests_decl_hdrs.hh',
- 'recursive_tests_defn_hdrs.hh',
- 'recursive_tests_macros.hh',
- 'tUnitTestSuite.hh',
- 'tUnitTestSuiteRecurser.hh',
- 'tVerifierSuite.hh',
- 'tVerifierSuiteRecurser.hh',
- 'win32_mkdir_hack.hh',
'cArgContainer.h',
'cArgSchema.h',
'cBlockStruct.h',
@@ -63,6 +55,9 @@
'cVerifierSuiteRecurser.h',
'cWeightedIndex.h',
'functions.h',
+ 'recursive_tests_decl_hdrs.hh',
+ 'recursive_tests_defn_hdrs.hh',
+ 'recursive_tests_macros.hh',
'tArgDataEntry.h',
'tArray.h',
'tBuffer.h',
@@ -78,7 +73,11 @@
'tMemTrack.h',
'tObjectFactory.h',
'tSmartArray.h',
+ 'tUnitTestSuite.hh',
+ 'tUnitTestSuiteRecurser.hh',
'tVector.h',
+ 'tVerifierSuite.hh',
+ 'tVerifierSuiteRecurser.hh',
]
srcs = [
Modified: development/source/tools/cDataFile.cc
===================================================================
--- development/source/tools/cDataFile.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cDataFile.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -27,10 +27,8 @@
#include "cStringUtil.h"
-extern "C" {
-#include <stdio.h>
-#include <time.h>
-}
+#include <cstdio>
+#include <ctime>
using namespace std;
Modified: development/source/tools/cDataFileManager.cc
===================================================================
--- development/source/tools/cDataFileManager.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cDataFileManager.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -13,9 +13,9 @@
#include "cTools.h"
#ifdef WIN32
-#include <direct.h>
+# include <direct.h>
#else
-#include <unistd.h>
+# include <unistd.h>
#endif
#define MAXIMUM_DIRECTORY_LENGTH 2048
Modified: development/source/tools/cDoubleSum.h
===================================================================
--- development/source/tools/cDoubleSum.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cDoubleSum.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,8 +26,8 @@
#ifndef cDoubleSum_h
#define cDoubleSum_h
-#include <math.h>
-#include <limits.h>
+#include <cmath>
+#include <climits>
class cDoubleSum {
private:
Modified: development/source/tools/cFile.cc
===================================================================
--- development/source/tools/cFile.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cFile.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -25,13 +25,10 @@
#include "cFile.h"
+#include <cerrno> // needed for FOPEN error constants (MSVC)
+#include <cstdlib>
#include <iostream>
-extern "C" {
-#include <stdlib.h>
-#include <errno.h> // needed for FOPEN error constants (MSVC)
-}
-
using namespace std;
Modified: development/source/tools/cHistogram.cc
===================================================================
--- development/source/tools/cHistogram.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cHistogram.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -27,10 +27,7 @@
#include "functions.h"
-extern "C" {
-#include <stdio.h>
-}
-
+#include <cstdio>
#include <iostream>
using namespace std;
Modified: development/source/tools/cHistogram.h
===================================================================
--- development/source/tools/cHistogram.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cHistogram.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,13 +26,10 @@
#ifndef cHistogram_h
#define cHistogram_h
+#include <cmath>
#include <iostream>
-extern "C" {
-#include <math.h>
-}
-
class cHistogram {
private:
int * bins;
Modified: development/source/tools/cIntSum.h
===================================================================
--- development/source/tools/cIntSum.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cIntSum.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,8 +26,8 @@
#ifndef cIntSum_h
#define cIntSum_h
-#include <math.h>
-#include <limits.h>
+#include <cmath>
+#include <climits>
class cIntSum
{
Modified: development/source/tools/cMerit.h
===================================================================
--- development/source/tools/cMerit.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cMerit.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -27,9 +27,9 @@
#define cMerit_h
#include <iostream>
-#include <math.h>
-#include <limits.h>
-#include <assert.h>
+#include <cmath>
+#include <climits>
+#include <cassert>
class cMerit
{
Modified: development/source/tools/cMessageDisplay.cc
===================================================================
--- development/source/tools/cMessageDisplay.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cMessageDisplay.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -24,9 +24,9 @@
#include "cMessageDisplay_headers.h"
-#include <limits.h>
-#include <stdio.h>
-#include <stdarg.h>
+#include <climits>
+#include <cstdio>
+#include <cstdarg>
#include "../third-party/trio/trio.h"
#include <iostream>
Modified: development/source/tools/cRandom.cc
===================================================================
--- development/source/tools/cRandom.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cRandom.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -13,9 +13,9 @@
#include "tArray.h"
#ifdef WIN32
-#include <process.h>
+# include <process.h>
#else
-#include <unistd.h>
+# include <unistd.h>
#endif
Modified: development/source/tools/cRandom.h
===================================================================
--- development/source/tools/cRandom.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cRandom.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -17,9 +17,9 @@
# endif
#endif
-#include <time.h>
-#include <limits.h>
-#include <math.h>
+#include <ctime>
+#include <climits>
+#include <cmath>
#include <pthread.h>
/**
Modified: development/source/tools/cRunningAverage.cc
===================================================================
--- development/source/tools/cRunningAverage.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cRunningAverage.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -25,7 +25,7 @@
#include "cRunningAverage.h"
-#include <assert.h>
+#include <cassert>
cRunningAverage::cRunningAverage( int window_size ) :
Modified: development/source/tools/cRunningAverage.h
===================================================================
--- development/source/tools/cRunningAverage.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cRunningAverage.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,7 +26,7 @@
#ifndef cRunningAverage_h
#define cRunningAverage_h
-#include <math.h>
+#include <cmath>
class cRunningAverage
{
Modified: development/source/tools/cString.cc
===================================================================
--- development/source/tools/cString.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cString.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -25,10 +25,8 @@
#include "cString.h"
-extern "C"{
-#include <stdio.h>
-#include <stdarg.h>
-}
+#include <cstdarg>
+#include <cstdio>
using namespace std;
Modified: development/source/tools/cString.h
===================================================================
--- development/source/tools/cString.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cString.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -2,7 +2,7 @@
* cString.h
* Avida
*
- * Called "string.hh" prior to 12/7/05.
+ * Called "cstringh" prior to 12/7/05.
* Copyright 1999-2007 Michigan State University. All rights reserved.
* Copyright 1993-2003 California Institute of Technology.
*
@@ -26,11 +26,11 @@
#ifndef cString_h
#define cString_h
-#include <stdlib.h>
+#include <cstdlib>
#include <iostream>
#include <string>
-#include <string.h>
-#include <assert.h>
+#include <cstring>
+#include <cassert>
#if USE_tMemTrack
# ifndef tMemTrack_h
Modified: development/source/tools/cStringUtil.cc
===================================================================
--- development/source/tools/cStringUtil.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cStringUtil.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -28,10 +28,8 @@
#include "functions.h"
#include "tMatrix.h"
-extern "C"{
-#include <stdio.h>
-#include <stdarg.h>
-}
+#include <cstdarg>
+#include <cstdio>
using namespace std;
Modified: development/source/tools/cTools.cc
===================================================================
--- development/source/tools/cTools.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cTools.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -11,9 +11,9 @@
#include "cTools.h"
#include <iostream>
-#include <errno.h>
+#include <cerrno>
#include <sys/stat.h>
-#include <stdio.h>
+#include <cstdio>
#include "cString.h"
@@ -23,6 +23,22 @@
# endif
#endif
+
+// mkdir undefined in win32
+#ifdef WIN32
+# include <direct.h>
+# ifndef ACCESSPERMS
+# define ACCESSPERMS 0
+# endif
+# ifndef mkdir
+# define mkdir(path, ignored_mode) _mkdir(path)
+# endif
+# ifndef mode_t
+# define mode_t unsigned int
+# endif
+#endif
+
+
using namespace std;
Modified: development/source/tools/cUInt.h
===================================================================
--- development/source/tools/cUInt.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/cUInt.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -26,7 +26,7 @@
#ifndef cUInt_h
#define cUInt_h
-#include <stdio.h>
+#include <cstdio>
// Should this just use a long? For testing only...
#define LONG_C_UINT
Modified: development/source/tools/functions.h
===================================================================
--- development/source/tools/functions.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/functions.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -27,9 +27,9 @@
#define functions_h
#include <iostream>
-#include <math.h>
-#include <stdio.h>
-#include <assert.h>
+#include <cmath>
+#include <cstdio>
+#include <cassert>
#ifndef tArray_h
#include "tArray.h"
Modified: development/source/tools/tArray.h
===================================================================
--- development/source/tools/tArray.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/tArray.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -32,7 +32,7 @@
# endif
#endif
-#include <assert.h>
+#include <cassert>
#ifndef NULL
#define NULL 0
Modified: development/source/tools/tBuffer.h
===================================================================
--- development/source/tools/tBuffer.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/tBuffer.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -39,7 +39,7 @@
#include "tArray.h"
#endif
-#include <assert.h>
+#include <cassert>
#include <iostream>
Modified: development/source/tools/tHashTable.h
===================================================================
--- development/source/tools/tHashTable.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/tHashTable.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -74,7 +74,7 @@
#include "tList.h"
#endif
-#include <stdlib.h>
+#include <cstdlib>
#if USE_tMemTrack
# ifndef tMemTrack_h
Modified: development/source/tools/tManagedPointerArray.h
===================================================================
--- development/source/tools/tManagedPointerArray.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/tManagedPointerArray.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -35,7 +35,7 @@
#include "tArray.h"
#endif
-#include <assert.h>
+#include <cassert>
template <class T> class tManagedPointerArray
{
Modified: development/source/tools/tMatrix.h
===================================================================
--- development/source/tools/tMatrix.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/tMatrix.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -63,7 +63,7 @@
#include "tArray.h"
#endif
-#include <assert.h>
+#include <cassert>
/**
* This class provides a matrix template.
Modified: development/source/tools/tSmartArray.h
===================================================================
--- development/source/tools/tSmartArray.h 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/tSmartArray.h 2007-02-27 14:11:06 UTC (rev 1374)
@@ -35,7 +35,7 @@
#include "tArray.h"
#endif
-#include <assert.h>
+#include <cassert>
// "I am so smart..."
static const int SMRT_INCREASE_MINIMUM = 10;
Deleted: development/source/tools/win32_mkdir_hack.hh
===================================================================
--- development/source/tools/win32_mkdir_hack.hh 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/tools/win32_mkdir_hack.hh 2007-02-27 14:11:06 UTC (rev 1374)
@@ -1,23 +0,0 @@
-#ifndef WIN32_MKDIR_HACK_HH
-#define WIN32_MKDIR_HACK_HH
-
-/*
-FIXME: mkdir undefined in win32, need a cleaner workaround.
-any prefers where to put this?
--- kgn
-*/
-#ifdef WIN32
-# include <direct.h>
-# ifndef ACCESSPERMS
-# define ACCESSPERMS 0
-# endif
-# ifndef mkdir
-# define mkdir(path, ignored_mode) _mkdir(path)
-# endif
-# ifndef mode_t
-# define mode_t unsigned int
-# endif
-#endif
-
-
-#endif
Modified: development/source/utils/task_events/task_event_gen.old.cc
===================================================================
--- development/source/utils/task_events/task_event_gen.old.cc 2007-02-27 14:04:42 UTC (rev 1373)
+++ development/source/utils/task_events/task_event_gen.old.cc 2007-02-27 14:11:06 UTC (rev 1374)
@@ -1,4 +1,4 @@
-#include <iostream.h>
+#include <iostream>
#include "../../tools/tArray.h"
#include "../../tools/cFile.h"
More information about the Avida-cvs
mailing list