[Avida-SVN] r1367 - in development/source: main tools

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2007-02-25 19:06:04 -0500 (Sun, 25 Feb 2007)
New Revision: 1367

Modified:
   development/source/main/cTaskLib.cc
   development/source/tools/tList.h
Log:
Copy several Visual Studio related changes into development.

Modified: development/source/main/cTaskLib.cc
===================================================================
--- development/source/main/cTaskLib.cc	2007-02-25 23:47:21 UTC (rev 1366)
+++ development/source/main/cTaskLib.cc	2007-02-26 00:06:04 UTC (rev 1367)
@@ -388,8 +388,8 @@
 void cTaskLib::NewTask(const cString& name, const cString& desc, tTaskTest task_fun, int reqs,
                        cArgContainer* args)
 {
-  if (reqs & REQ_NEIGHBOR_INPUT == true) use_neighbor_input = true;
-  if (reqs & REQ_NEIGHBOR_OUTPUT == true) use_neighbor_output = true;
+  if (reqs & REQ_NEIGHBOR_INPUT) use_neighbor_input = true;
+  if (reqs & REQ_NEIGHBOR_OUTPUT) use_neighbor_output = true;
   
   const int id = task_array.GetSize();
   task_array.Resize(id + 1);

Modified: development/source/tools/tList.h
===================================================================
--- development/source/tools/tList.h	2007-02-25 23:47:21 UTC (rev 1366)
+++ development/source/tools/tList.h	2007-02-26 00:06:04 UTC (rev 1367)
@@ -45,8 +45,14 @@
   tListNode<T> * next;
   tListNode<T> * prev;
   
-  tListNode() : data(NULL), next(this), prev(this) { ; }
-
+// @DMB - Visual Studio doesn't like usage of 'this' in initializers 
+//        and throws a lot of useless warnings. 
+#ifdef WIN32 
+  tListNode() : data(NULL) { next = this; prev = this; } 
+#else 
+  tListNode() : data(NULL), next(this), prev(this) { ; } 
+#endif 
+    
   template<class Archive>
   void serialize(Archive & a, const unsigned int version){
     a.ArkvObj("data", data);