[avida-cvs] avida CVS commits: /current/source/cpu hardware_4stack_thread.hh hardware_cpu_thread.hh /current/source/event event_list_iterator.hh /current/source/main analyze.cc analyze_genotype.hh landscape.hh mx_code_array.hh resource_count.cc task_lib.cc /current/source/tools data_file.cc file.cc histogram.cc histogram.hh init_file.hh
kaben
avida-cvs at alife.org
Thu Dec 4 21:36:19 PST 2003
kaben Thu Dec 4 13:36:19 2003 EDT
Modified files:
/avida/current/source/cpu hardware_4stack_thread.hh
hardware_cpu_thread.hh
/avida/current/source/event event_list_iterator.hh
/avida/current/source/main analyze.cc analyze_genotype.hh
landscape.hh mx_code_array.hh
resource_count.cc task_lib.cc
/avida/current/source/tools data_file.cc file.cc histogram.cc
histogram.hh init_file.hh
Log:
Fixups permitting compile under gcc2.96 (under host 'alice'), as suggested by
charles.
- replaced includes of istream/ostream with iostream.
- some files needed includes of time.h and math.h.
Index: avida/current/source/cpu/hardware_4stack_thread.hh
diff -u avida/current/source/cpu/hardware_4stack_thread.hh:1.1 avida/current/source/cpu/hardware_4stack_thread.hh:1.2
--- avida/current/source/cpu/hardware_4stack_thread.hh:1.1 Tue Nov 25 09:37:55 2003
+++ avida/current/source/cpu/hardware_4stack_thread.hh Thu Dec 4 13:36:18 2003
@@ -8,8 +8,7 @@
#ifndef HARDWARE_4STACK_THREAD_HH
#define HARDWARE_4STACK_THREAD_HH
-#include <istream>
-#include <ostream>
+#include <iostream>
#ifndef CODE_LABEL_HH
#include "code_label.hh"
Index: avida/current/source/cpu/hardware_cpu_thread.hh
diff -u avida/current/source/cpu/hardware_cpu_thread.hh:1.1 avida/current/source/cpu/hardware_cpu_thread.hh:1.2
--- avida/current/source/cpu/hardware_cpu_thread.hh:1.1 Tue Nov 25 09:37:55 2003
+++ avida/current/source/cpu/hardware_cpu_thread.hh Thu Dec 4 13:36:18 2003
@@ -8,8 +8,7 @@
#ifndef HARDWARE_CPU_THREAD_HH
#define HARDWARE_CPU_THREAD_HH
-#include <istream>
-#include <ostream>
+#include <iostream>
#ifndef CODE_LABEL_HH
#include "code_label.hh"
Index: avida/current/source/event/event_list_iterator.hh
diff -u avida/current/source/event/event_list_iterator.hh:1.1 avida/current/source/event/event_list_iterator.hh:1.2
--- avida/current/source/event/event_list_iterator.hh:1.1 Tue Nov 25 09:37:55 2003
+++ avida/current/source/event/event_list_iterator.hh Thu Dec 4 13:36:18 2003
@@ -8,7 +8,7 @@
#ifndef EVENT_LIST_ITERATOR_HH
#define EVENT_LIST_ITERATOR_HH
-#include <ostream>
+#include <iostream>
#ifndef EVENT_LIST_ENTRY_HH
#include "event_list_entry.hh"
Index: avida/current/source/main/analyze.cc
diff -u avida/current/source/main/analyze.cc:1.86 avida/current/source/main/analyze.cc:1.87
--- avida/current/source/main/analyze.cc:1.86 Tue Nov 25 09:37:56 2003
+++ avida/current/source/main/analyze.cc Thu Dec 4 13:36:18 2003
@@ -96,7 +96,10 @@
# endif
#endif
+extern "C" {
+#include <errno.h>
#include <sys/stat.h>
+}
using namespace std;
Index: avida/current/source/main/analyze_genotype.hh
diff -u avida/current/source/main/analyze_genotype.hh:1.1 avida/current/source/main/analyze_genotype.hh:1.2
--- avida/current/source/main/analyze_genotype.hh:1.1 Tue Nov 25 09:37:56 2003
+++ avida/current/source/main/analyze_genotype.hh Thu Dec 4 13:36:19 2003
@@ -8,6 +8,8 @@
#ifndef ANALYZE_GENOTYPE_HH
#define ANALYZE_GENOTYPE_HH
+#include <fstream>
+
#ifndef FUNCTIONS_HH
#include "functions.hh"
#endif
Index: avida/current/source/main/landscape.hh
diff -u avida/current/source/main/landscape.hh:1.19 avida/current/source/main/landscape.hh:1.20
--- avida/current/source/main/landscape.hh:1.19 Tue Nov 25 09:37:57 2003
+++ avida/current/source/main/landscape.hh Thu Dec 4 13:36:19 2003
@@ -8,7 +8,7 @@
#ifndef LANDSCAPE_HH
#define LANDSCAPE_HH
-#include <ostream>
+#include <iostream>
#ifndef CPU_TEST_INFO_HH
#include "cpu_test_info.hh"
Index: avida/current/source/main/mx_code_array.hh
diff -u avida/current/source/main/mx_code_array.hh:1.1 avida/current/source/main/mx_code_array.hh:1.2
--- avida/current/source/main/mx_code_array.hh:1.1 Tue Nov 25 09:37:57 2003
+++ avida/current/source/main/mx_code_array.hh Thu Dec 4 13:36:19 2003
@@ -8,10 +8,10 @@
#ifndef MX_CODE_ARRAY_HH
#define MX_CODE_ARRAY_HH
-#include <map>
+#include <iostream>
#include <list>
+#include <map>
#include <set>
-#include <ostream>
#ifndef INSTRUCTION_HH
#include "instruction.hh"
Index: avida/current/source/main/resource_count.cc
diff -u avida/current/source/main/resource_count.cc:1.10 avida/current/source/main/resource_count.cc:1.11
--- avida/current/source/main/resource_count.cc:1.10 Tue Nov 25 09:37:58 2003
+++ avida/current/source/main/resource_count.cc Thu Dec 4 13:36:19 2003
@@ -13,6 +13,10 @@
#include "config.hh"
#endif
+extern "C" {
+#include <math.h>
+}
+
using namespace std;
const double cResourceCount::UPDATE_STEP(1.0 / 10000.0);
Index: avida/current/source/main/task_lib.cc
diff -u avida/current/source/main/task_lib.cc:1.1 avida/current/source/main/task_lib.cc:1.2
--- avida/current/source/main/task_lib.cc:1.1 Tue Nov 25 09:37:58 2003
+++ avida/current/source/main/task_lib.cc Thu Dec 4 13:36:19 2003
@@ -13,6 +13,11 @@
#include "task_entry.hh"
#endif
+extern "C" {
+#include <math.h>
+#include <limits.h>
+}
+
using namespace std;
////////////////////////
Index: avida/current/source/tools/data_file.cc
diff -u avida/current/source/tools/data_file.cc:1.1 avida/current/source/tools/data_file.cc:1.2
--- avida/current/source/tools/data_file.cc:1.1 Tue Nov 25 09:38:00 2003
+++ avida/current/source/tools/data_file.cc Thu Dec 4 13:36:19 2003
@@ -13,6 +13,11 @@
#include "string_util.hh"
#endif
+extern "C" {
+#include <stdio.h>
+#include <time.h>
+}
+
using namespace std;
void cDataFile::Init()
Index: avida/current/source/tools/file.cc
diff -u avida/current/source/tools/file.cc:1.22 avida/current/source/tools/file.cc:1.23
--- avida/current/source/tools/file.cc:1.22 Tue Nov 25 09:38:00 2003
+++ avida/current/source/tools/file.cc Thu Dec 4 13:36:19 2003
@@ -19,14 +19,16 @@
#include "string_iterator.hh"
#endif
+#ifndef TOOLS_HH
+#include "tools.hh" // for g_debug global
+#endif
+
+#include <iostream>
+
extern "C" {
#include <stdlib.h>
#include <errno.h> // needed for FOPEN error constants (MSVC)
}
-
-#ifndef TOOLS_HH
-#include "tools.hh" // for g_debug global
-#endif
using namespace std;
Index: avida/current/source/tools/histogram.cc
diff -u avida/current/source/tools/histogram.cc:1.1 avida/current/source/tools/histogram.cc:1.2
--- avida/current/source/tools/histogram.cc:1.1 Tue Nov 25 09:38:00 2003
+++ avida/current/source/tools/histogram.cc Thu Dec 4 13:36:19 2003
@@ -13,7 +13,9 @@
#include "functions.hh"
#endif
+extern "C" {
#include <stdio.h>
+}
// cHistogram /////////////////////////////////////////////////////////////////
Index: avida/current/source/tools/histogram.hh
diff -u avida/current/source/tools/histogram.hh:1.1 avida/current/source/tools/histogram.hh:1.2
--- avida/current/source/tools/histogram.hh:1.1 Tue Nov 25 09:38:00 2003
+++ avida/current/source/tools/histogram.hh Thu Dec 4 13:36:19 2003
@@ -10,6 +10,10 @@
#include <iostream>
+extern "C" {
+#include <math.h>
+}
+
class cHistogram {
private:
int * bins;
Index: avida/current/source/tools/init_file.hh
diff -u avida/current/source/tools/init_file.hh:1.1 avida/current/source/tools/init_file.hh:1.2
--- avida/current/source/tools/init_file.hh:1.1 Tue Nov 25 09:38:00 2003
+++ avida/current/source/tools/init_file.hh Thu Dec 4 13:36:19 2003
@@ -8,7 +8,7 @@
#ifndef INIT_FILE_HH
#define INIT_FILE_HH
-#include <istream>
+#include <iostream>
#ifndef FILE_HH
#include "file.hh"
More information about the Avida-cvs
mailing list