[avida-cvs] avida(kaben) CVS commits: /current/source/main config.hh /current/source/third-party/yaktest test_case.h /current/source/tools tDataEntry.hh tDictionary.hh

[kaben]

kaben		Tue Dec 16 14:37:14 2003 EDT

  Modified files:              (Branch: kaben)
    /avida/current/source/main	config.hh 
    /avida/current/source/third-party/yaktest	test_case.h 
    /avida/current/source/tools	tDataEntry.hh tDictionary.hh 
  Log:
  
  Windows support for builds of primitive executable and for primitive
  unit tests, via CMake-generated Visual Studio project.
  
  
  
Index: avida/current/source/main/config.hh
diff -u avida/current/source/main/config.hh:1.61.2.1 avida/current/source/main/config.hh:1.61.2.2
--- avida/current/source/main/config.hh:1.61.2.1	Mon Dec 15 10:05:44 2003
+++ avida/current/source/main/config.hh	Tue Dec 16 14:37:14 2003
@@ -8,6 +8,9 @@
 #ifndef CONFIG_HH
 #define CONFIG_HH
 
+#ifndef GENESIS_HH
+#include "genesis.hh"
+#endif
 #ifndef STRING_LIST_HH
 #include "string_list.hh"
 #endif
Index: avida/current/source/third-party/yaktest/test_case.h
diff -u avida/current/source/third-party/yaktest/test_case.h:1.1.2.1 avida/current/source/third-party/yaktest/test_case.h:1.1.2.2
--- avida/current/source/third-party/yaktest/test_case.h:1.1.2.1	Mon Dec 15 10:05:49 2003
+++ avida/current/source/third-party/yaktest/test_case.h	Tue Dec 16 14:37:14 2003
@@ -14,7 +14,7 @@
 using std::ostringstream;
 #endif //WIN32
 
-// $Id: test_case.h,v 1.1.2.1 2003/12/15 18:05:49 kaben Exp $
+// $Id: test_case.h,v 1.1.2.2 2003/12/16 22:37:14 kaben Exp $
 /*! A composite test case 
  * its atomic test can be redefined by overriding
  * test(); it can also serve as a suite of tests by adding test_cases
@@ -152,13 +152,13 @@
 //these macros are used instead of the code stubs in test_case
 //in order to use preprocessor features to get filename/line number
 #ifdef WIN32
-  #define test_non_error( condition ) (this->test_non_error_stub( (condition), (#condition), __FILE__, __LINE__ ))
-  #define test_is_true( condition ) (this->test_is_true_stub( (condition), (#condition), __FILE__, __LINE__ ))
-  #define test_int_is_equal( actual_value, expected_value ) (this->test_int_is_equal_stub( actual_value, expected_value, __FILE__, __LINE__ ))
-  #define test_double_is_equal( actual_value, expected_value ) (this->test_double_is_equal_stub( actual_value, expected_value, __FILE__, __LINE__ ))
-  #define double_is_within_tolerance( actual_value, expected_value, tolerance ) ( this->test_double_is_equal_stub( actual_value, expected_value, __FILE__, __LINE__, tolerance ))
-  #define test_string_is_equal( actual_value, expected_value ) (this->test_string_is_equal_stub( actual_value, expected_value, __FILE__, __LINE__ ))
-  #define test_is_equal( actual_value, expected_value ) (this->test_is_equal_stub( actual_value, expected_value, __FILE__, __LINE__ ))
+  #define test_non_error( condition ) (this->test_non_error_stub( (condition), (#condition), __FILE__, (""), __LINE__ ))
+  #define test_is_true( condition ) (this->test_is_true_stub( (condition), (#condition), __FILE__, (""), __LINE__ ))
+  #define test_int_is_equal( actual_value, expected_value ) (this->test_int_is_equal_stub( actual_value, expected_value, __FILE__, (""), __LINE__ ))
+  #define test_double_is_equal( actual_value, expected_value ) (this->test_double_is_equal_stub( actual_value, expected_value, __FILE__, (""), __LINE__ ))
+  #define double_is_within_tolerance( actual_value, expected_value, tolerance ) ( this->test_double_is_equal_stub( actual_value, expected_value, __FILE__, (""), __LINE__, tolerance ))
+  #define test_string_is_equal( actual_value, expected_value ) (this->test_string_is_equal_stub( actual_value, expected_value, __FILE__, (""), __LINE__ ))
+  #define test_is_equal( actual_value, expected_value ) (this->test_is_equal_stub( actual_value, expected_value, __FILE__, (""), __LINE__ ))
 #else // WIN32
   #define test_non_error( condition ) (this->test_non_error_stub( (condition), (#condition), __FILE__, __PRETTY_FUNCTION__, __LINE__ ))
   #define test_is_true( condition ) (this->test_is_true_stub( (condition), (#condition), __FILE__, __PRETTY_FUNCTION__, __LINE__ ))
Index: avida/current/source/tools/tDataEntry.hh
diff -u avida/current/source/tools/tDataEntry.hh:1.1 avida/current/source/tools/tDataEntry.hh:1.1.2.1
--- avida/current/source/tools/tDataEntry.hh:1.1	Tue Nov 25 09:38:01 2003
+++ avida/current/source/tools/tDataEntry.hh	Tue Dec 16 14:37:14 2003
@@ -21,7 +21,7 @@
 #endif
 
 class cString;
-class cStringUtil; // access
+struct cStringUtil; // access
 
 template <class T, class OUT> class tDataEntry : public tDataEntryBase<T> {
 protected:
Index: avida/current/source/tools/tDictionary.hh
diff -u avida/current/source/tools/tDictionary.hh:1.6 avida/current/source/tools/tDictionary.hh:1.6.2.1
--- avida/current/source/tools/tDictionary.hh:1.6	Tue Nov 25 09:38:01 2003
+++ avida/current/source/tools/tDictionary.hh	Tue Dec 16 14:37:14 2003
@@ -23,7 +23,7 @@
 #define DICTIONARY_HASH_LARGE   2311
 
 class cString; // aggregate
-class cStringUtil; // access
+struct cStringUtil; // access
 template <class T> class tList; // access
 template <class T> class tListIterator; // aggregate