[Avida-cvs] [Avida2-svn] r346 - in trunk: . Avida2.xcodeproj source source/cpu source/event source/main source/viewers
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Sun Oct 16 07:39:56 PDT 2005
Author: brysonda
Date: 2005-10-16 10:39:55 -0400 (Sun, 16 Oct 2005)
New Revision: 346
Added:
trunk/source/defs.h
Removed:
trunk/source/defs.hh
Modified:
trunk/Avida2.xcodeproj/project.pbxproj
trunk/source/cpu/cCodeLabel.h
trunk/source/cpu/cHardware4Stack.h
trunk/source/cpu/cHardwareCPU.h
trunk/source/cpu/cHardwareSMT.h
trunk/source/cpu/cHeadCPU.h
trunk/source/cpu/cHeadMultiMem.h
trunk/source/event/cEventList.cc
trunk/source/main/avida.cc
trunk/source/main/cAnalyzeUtil.cc
trunk/source/main/cAvidaConfig.cc
trunk/source/main/cConfig.cc
trunk/source/main/cFitnessMatrix.h
trunk/source/main/cGenebank.h
trunk/source/main/cGenotypeControl.cc
trunk/source/main/cGenotype_BirthData.cc
trunk/source/main/cInjectGenebank.h
trunk/source/main/cInjectGenotypeControl.cc
trunk/source/main/cInjectGenotypeElement.h
trunk/source/main/cInjectGenotype_BirthData.cc
trunk/source/main/cInstruction.h
trunk/source/main/cReactionProcess.cc
trunk/source/main/cSpeciesControl.cc
trunk/source/main/cSpeciesQueue.cc
trunk/source/main/cStats.h
trunk/source/main/primitive.cc
trunk/source/viewers/ansi.hh
trunk/source/viewers/text_screen.hh
trunk/status.xml
Log:
Rename defs.hh --> defs.h
Modified: trunk/Avida2.xcodeproj/project.pbxproj
===================================================================
--- trunk/Avida2.xcodeproj/project.pbxproj 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/Avida2.xcodeproj/project.pbxproj 2005-10-16 14:39:55 UTC (rev 346)
@@ -372,6 +372,7 @@
701384330900A45B0087ED2E /* organism.smtx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.smtx; sourceTree = "<group>"; };
7013845F09028B3E0087ED2E /* cAvidaConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cAvidaConfig.h; sourceTree = "<group>"; };
7013846009028B3E0087ED2E /* cAvidaConfig.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cAvidaConfig.cc; sourceTree = "<group>"; };
+ 701384A10902A16F0087ED2E /* defs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; };
702D4EF208DA5328007BA469 /* cAvidaDriver_Analyze.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cAvidaDriver_Analyze.h; sourceTree = "<group>"; };
702D4EF308DA5328007BA469 /* cAvidaDriver_Base.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cAvidaDriver_Base.h; sourceTree = "<group>"; };
702D4EF408DA5328007BA469 /* cAvidaDriver_Population.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cAvidaDriver_Population.h; sourceTree = "<group>"; };
@@ -1073,7 +1074,6 @@
DCC30F7B0762539D008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
DCC30FA90762539D008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
DCC30FAC0762539D008F7A48 /* cpu.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cpu.pri; sourceTree = "<group>"; };
- DCC30FCE0762539D008F7A48 /* defs.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = defs.hh; sourceTree = "<group>"; };
DCC30FCF0762539D008F7A48 /* Doxyfile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Doxyfile; sourceTree = "<group>"; };
DCC30FEB0762539D008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
DCC30FF00762539D008F7A48 /* event.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event.pri; sourceTree = "<group>"; };
@@ -1681,7 +1681,7 @@
DCC315B6076253A5008F7A48 /* utils */,
DCC315D2076253A5008F7A48 /* viewers */,
DCC30F7B0762539D008F7A48 /* CMakeLists.txt */,
- DCC30FCE0762539D008F7A48 /* defs.hh */,
+ 701384A10902A16F0087ED2E /* defs.h */,
DCC30FCF0762539D008F7A48 /* Doxyfile */,
DCC311390762539E008F7A48 /* modules.pri */,
);
Modified: trunk/source/cpu/cCodeLabel.h
===================================================================
--- trunk/source/cpu/cCodeLabel.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/cpu/cCodeLabel.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -12,7 +12,7 @@
#include "nHardware.h" // #defines only
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef STRING_HH
#include "cString.h"
Modified: trunk/source/cpu/cHardware4Stack.h
===================================================================
--- trunk/source/cpu/cHardware4Stack.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/cpu/cHardware4Stack.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -17,7 +17,7 @@
#include "cCPUStack.h"
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef HEAD_MULTI_MEM_HH
#include "cHeadMultiMem.h"
Modified: trunk/source/cpu/cHardwareCPU.h
===================================================================
--- trunk/source/cpu/cHardwareCPU.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/cpu/cHardwareCPU.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -12,7 +12,7 @@
#include <vector>
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef CODE_LABEL_HH
#include "cCodeLabel.h"
Modified: trunk/source/cpu/cHardwareSMT.h
===================================================================
--- trunk/source/cpu/cHardwareSMT.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/cpu/cHardwareSMT.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -19,7 +19,7 @@
#include "cCPUStack.h"
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef HEAD_MULTI_MEM_HH
#include "cHeadMultiMem.h"
Modified: trunk/source/cpu/cHeadCPU.h
===================================================================
--- trunk/source/cpu/cHeadCPU.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/cpu/cHeadCPU.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -9,7 +9,7 @@
#define HEAD_CPU_HH
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
class cHardwareBase;
Modified: trunk/source/cpu/cHeadMultiMem.h
===================================================================
--- trunk/source/cpu/cHeadMultiMem.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/cpu/cHeadMultiMem.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -12,7 +12,7 @@
#include "cHeadCPU.h"
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
class cCodeLabel;
Copied: trunk/source/defs.h (from rev 345, trunk/source/defs.hh)
Deleted: trunk/source/defs.hh
===================================================================
--- trunk/source/defs.hh 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/defs.hh 2005-10-16 14:39:55 UTC (rev 346)
@@ -1,183 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef DEFS_HH
-#define DEFS_HH
-
-#define VERSION "2.3.1"
-#define VERSION_TAG "Padawan"
-
-
-#define DEFAULT_DIR "../work/"
-
-/*
-FIXME: remove asap, switching to file-configureable option
-*/
-// path to html doc files
-#ifndef HTMLDIR
-#define HTMLDIR "../work/doc_html/"
-#endif
-
-
-// -= Various view modes =-
-#define VIEW_NEWVIEWER
-// #define VIEW_VISTA
-// #define VIEW_PRIMITIVE
-// #define VIEW_EXTERNAL
-// #define VIEW_CURSES
-// #define VIEW_NCURSES
-// #define VIEW_ANSI
-
-
-// -= Speedups =- (define these to allow features to be turned on)
-
-// #define BREAKPOINTS
-// #define QUICK_BASE_TEST_CPU
-// #define QUICK_HEAD_TEST_CPU
-#define INSTRUCTION_COSTS
-#define INSTRUCTION_COUNT
-
-// -= Toggles =- (define these to actually turn features on)
-
-#define WRITE_PROTECTION
-// #define FATAL_ERRORS
-// #define FATAL_WARNINGS
-#define SINGLE_IO_BUFFER
-
-// Test to see if search approx equals size... value is +- tolerance
-// #define TEST_SEARCH_SIZE .25
-
-// #define DEBUG
-// #define DEBUG_CHECK_OK
-// #define DEBUG_MEMTRACK
-// #define INTEGRITY_CHECK
-// #define DEBUG_MEM_CHECK
-// #define TEST
-
-
-////// Compiler Compatability Stuff //////////
-
-// old compiler //
-//#define explicit
-//#define LONGINT int
-
-// snazzy compiler //
-#define LONGINT long int
-
-
-////// Don't change anything below this line. /////
-#ifdef QUICK_BASE_TEST_CPU
-#define QUICK_TEST_CPU
-#endif
-
-#ifdef QUICK_HEAD_TEST_CPU
-#define QUICK_TEST_CPU
-#endif
-
-#ifdef VIEW_primitive
-#define VIEW_PRIMITIVE
-#endif
-#ifdef VIEW_external
-#define VIEW_EXTERNAL
-#endif
-#ifdef VIEW_curses
-#define VIEW_CURSES
-#endif
-#ifdef VIEW_ncurses
-#define VIEW_NCURSES
-#endif
-#ifdef VIEW_vista
-#define VIEW_VISTA
-#define VIEW_PRIMITIVE
-#endif
-
-#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
-#endif
-#endif
-
-#ifdef PLATFORM_WINDOWS
- #ifdef UINT // Some modules will not compile w/out this (e.g. b_struct2)
- #undef UNIT
- #endif
-
- #ifdef UCHAR
- #undef UCHAR
- #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
-
-#define MAX_INT 4294967295
-#define MAX_INST_SET_SIZE 64
-
-// #ifndef FALSE
-// #define FALSE 0
-// #define TRUE !FALSE
-// #endif
-
-#ifndef NULL
- #define NULL 0
-#endif
-
-#ifndef _WINDEF_ // Defined by WINDOWS.H
- #define UCHAR unsigned char
- #undef UINT
- #define UINT unsigned int
-#endif
-
-#define TOOLS_DIR tools
-#define CPU_DIR cpu
-#define MAIN_DIR main
-#define VIEW_DIR viewers
-
-#define MIN_CREATURE_SIZE 8
-#define MAX_CREATURE_SIZE 2048
-
-#define MIN_INJECT_SIZE 8
-
-// Number of distinct input and outputs stored in the IOBufs (to test tasks)
-#define INPUT_BUF_SIZE 3
-#define OUTPUT_BUF_SIZE 1
-#define SEND_BUF_SIZE 3
-#define RECEIVE_BUF_SIZE 3
-
-// Task Merit Method //
-#define TASK_MERIT_NONE 0
-#define TASK_MERIT_NORMAL 1 // Bonus just equals the task bonus
-
-#define MERIT_TIME_AT_TASK 0
-#define MERIT_TIME_AT_DIVIDE 1
-
-#define FILE_TYPE_TEXT 0
-#define FILE_TYPE_HTML 1
-
-enum tHARDWARE_TYPE
-{
- HARDWARE_TYPE_CPU_ORIGINAL = 0,
- HARDWARE_TYPE_CPU_4STACK,
- HARDWARE_TYPE_CPU_SMT
-};
-
-#endif
Modified: trunk/source/event/cEventList.cc
===================================================================
--- trunk/source/event/cEventList.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/event/cEventList.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -10,7 +10,7 @@
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef EVENT_FACTORY_MANAGER_HH
#include "cEventFactoryManager.h"
Modified: trunk/source/main/avida.cc
===================================================================
--- trunk/source/main/avida.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/avida.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -19,7 +19,7 @@
#include "cConfig.h"
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#include "cString.h"
#ifndef ENVIRONMENT_HH
Modified: trunk/source/main/cAnalyzeUtil.cc
===================================================================
--- trunk/source/main/cAnalyzeUtil.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cAnalyzeUtil.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -13,7 +13,7 @@
#include "cConfig.h"
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef ENVIRONMENT_HH
#include "cEnvironment.h"
Modified: trunk/source/main/cAvidaConfig.cc
===================================================================
--- trunk/source/main/cAvidaConfig.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cAvidaConfig.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -10,7 +10,7 @@
#include "cAvidaConfig.h"
#include <fstream>
-#include "defs.hh"
+#include "defs.h"
#include "cInitFile.h"
tList<cAvidaConfig::cBaseConfigGroup> cAvidaConfig::global_group_list;
Modified: trunk/source/main/cConfig.cc
===================================================================
--- trunk/source/main/cConfig.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cConfig.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -7,7 +7,7 @@
#include "cConfig.h"
-#include "defs.hh"
+#include "defs.h"
#include "cEventFactoryManager.h"
#include "cGenesis.h"
#include "cPopulationEventFactory.h"
Modified: trunk/source/main/cFitnessMatrix.h
===================================================================
--- trunk/source/main/cFitnessMatrix.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cFitnessMatrix.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -18,7 +18,7 @@
#include <sys/timeb.h>
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef MX_CODE_ARRAY_HH
#include "cMxCodeArray.h"
Modified: trunk/source/main/cGenebank.h
===================================================================
--- trunk/source/main/cGenebank.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cGenebank.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -11,7 +11,7 @@
#include <fstream>
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef GENOTYPE_CONTROL_HH
#include "cGenotypeControl.h"
Modified: trunk/source/main/cGenotypeControl.cc
===================================================================
--- trunk/source/main/cGenotypeControl.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cGenotypeControl.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -10,7 +10,7 @@
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef GENEBANK_HH
#include "cGenebank.h"
Modified: trunk/source/main/cGenotype_BirthData.cc
===================================================================
--- trunk/source/main/cGenotype_BirthData.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cGenotype_BirthData.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -10,7 +10,7 @@
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
/////////////////////////
Modified: trunk/source/main/cInjectGenebank.h
===================================================================
--- trunk/source/main/cInjectGenebank.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cInjectGenebank.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -11,7 +11,7 @@
#include <fstream>
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef nInjectGenotype_h
#include "nInjectGenotype.h"
Modified: trunk/source/main/cInjectGenotypeControl.cc
===================================================================
--- trunk/source/main/cInjectGenotypeControl.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cInjectGenotypeControl.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -10,7 +10,7 @@
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef INJECT_GENEBANK_HH
#include "cInjectGenebank.h"
Modified: trunk/source/main/cInjectGenotypeElement.h
===================================================================
--- trunk/source/main/cInjectGenotypeElement.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cInjectGenotypeElement.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -9,7 +9,7 @@
#define INJECT_GENOTYPE_ELEMENT_HH
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
class cInjectGenotype;
Modified: trunk/source/main/cInjectGenotype_BirthData.cc
===================================================================
--- trunk/source/main/cInjectGenotype_BirthData.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cInjectGenotype_BirthData.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -10,7 +10,7 @@
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
/////////////////////////
Modified: trunk/source/main/cInstruction.h
===================================================================
--- trunk/source/main/cInstruction.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cInstruction.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -11,7 +11,7 @@
#include <assert.h>
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
class cInstruction {
Modified: trunk/source/main/cReactionProcess.cc
===================================================================
--- trunk/source/main/cReactionProcess.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cReactionProcess.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -10,7 +10,7 @@
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef nReaction_h
#include "nReaction.h"
Modified: trunk/source/main/cSpeciesControl.cc
===================================================================
--- trunk/source/main/cSpeciesControl.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cSpeciesControl.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -13,7 +13,7 @@
#include "cConfig.h"
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef GENOTYPE_HH
#include "cGenotype.h"
Modified: trunk/source/main/cSpeciesQueue.cc
===================================================================
--- trunk/source/main/cSpeciesQueue.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cSpeciesQueue.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -10,7 +10,7 @@
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef SPECIES_HH
#include "cSpecies.h"
Modified: trunk/source/main/cStats.h
===================================================================
--- trunk/source/main/cStats.h 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/cStats.h 2005-10-16 14:39:55 UTC (rev 346)
@@ -13,7 +13,7 @@
#include <iostream>
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef DATA_FILE_MANAGER_HH
#include "cDataFileManager.h"
Modified: trunk/source/main/primitive.cc
===================================================================
--- trunk/source/main/primitive.cc 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/main/primitive.cc 2005-10-16 14:39:55 UTC (rev 346)
@@ -26,7 +26,7 @@
#include "cConfig.h"
#endif
#ifndef DEFS_HH
-#include "defs.hh"
+#include "defs.h"
#endif
#ifndef ENVIRONMENT_HH
#include "cEnvironment.h"
Modified: trunk/source/viewers/ansi.hh
===================================================================
--- trunk/source/viewers/ansi.hh 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/viewers/ansi.hh 2005-10-16 14:39:55 UTC (rev 346)
@@ -9,7 +9,7 @@
#ifndef VIEW_ANSI_HH
#define VIEW_ANSI_HH
-#include "defs.hh"
+#include "defs.h"
#ifdef VIEW_ANSI
Modified: trunk/source/viewers/text_screen.hh
===================================================================
--- trunk/source/viewers/text_screen.hh 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/source/viewers/text_screen.hh 2005-10-16 14:39:55 UTC (rev 346)
@@ -11,7 +11,7 @@
#include "cMerit.h"
#include "cInstSet.h"
-#include "defs.hh"
+#include "defs.h"
#include "ncurses.hh"
#include "ansi.hh"
Modified: trunk/status.xml
===================================================================
--- trunk/status.xml 2005-10-16 14:32:22 UTC (rev 345)
+++ trunk/status.xml 2005-10-16 14:39:55 UTC (rev 346)
@@ -513,12 +513,12 @@
depth of the most recent coalescent genotype.
</action>
<action dev="CAO" type="update" context="internal">
- Removed "defs.hh" dependency from assert; stay out of debug move by
+ Removed "" dependency from assert; stay out of debug move by
default -- only enter it when DEBUG is defined.
</action>
<action dev="CAO" type="update" context="internal">
Rebuilt data_file.??, simplifying the internal structure and using a
- proper linked list. Also removed dependency on defs.hh.
+ proper linked list. Also removed dependency on .
</action>
<action dev="CAO" type="update" context="internal">
Removed dependencies in string.?? ; fixed some bugs in Compare()
More information about the Avida-cvs
mailing list