[Avida-SVN] r3037 - in development: . source/platform

[goingssh at myxo.css.msu.edu]

Author: goingssh
Date: 2008-12-14 16:25:45 -0500 (Sun, 14 Dec 2008)
New Revision: 3037

Modified:
   development/Avida.vcproj
   development/source/platform/tThreadSpecific.h
Log:
updated vcproj file to include recently added and removed files so it works again now. Also fixed error in tThreadSpecific.h by commenting out void Set function, I have no idea if this is good or not, but you cannot have 2 functions that only differ by the return type so I picked one to comment out, if you wrote this file please feel encouraged to fix your file how it should be. Thanks.

Modified: development/Avida.vcproj
===================================================================
--- development/Avida.vcproj	2008-12-13 22:03:15 UTC (rev 3036)
+++ development/Avida.vcproj	2008-12-14 21:25:45 UTC (rev 3037)
@@ -345,10 +345,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\source\tools\cDataEntry.h"
-				>
-			</File>
-			<File
 				RelativePath=".\source\tools\cDataFile.h"
 				>
 			</File>
@@ -393,6 +389,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\drivers\cDriverStatusConduit.h"
+				>
+			</File>
+			<File
 				RelativePath=".\source\main\cEnvironment.h"
 				>
 			</File>
@@ -653,6 +653,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\main\cOrgMessage.h"
+				>
+			</File>
+			<File
 				RelativePath=".\source\main\cOrgMessagePredicate.h"
 				>
 			</File>
@@ -709,6 +713,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\tools\cRCObject.h"
+				>
+			</File>
+			<File
 				RelativePath=".\source\main\cReaction.h"
 				>
 			</File>
@@ -741,6 +749,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\main\cResourceHistory.h"
+				>
+			</File>
+			<File
 				RelativePath=".\source\main\cResourceLib.h"
 				>
 			</File>
@@ -1173,10 +1185,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\source\tools\cDataEntry.cc"
-				>
-			</File>
-			<File
 				RelativePath=".\source\tools\cDataFile.cc"
 				>
 			</File>
@@ -1221,6 +1229,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\drivers\cDriverStatusConduit.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\source\main\cEnvironment.cc"
 				>
 			</File>
@@ -1269,6 +1281,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\analyze\cGenotypeBatch.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\source\classification\cGenotypeControl.cc"
 				>
 			</File>
@@ -1413,6 +1429,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\main\cOrgMessage.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\source\main\cPhenotype.cc"
 				>
 			</File>
@@ -1449,6 +1469,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\tools\cRCObject.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\source\main\cReaction.cc"
 				>
 			</File>
@@ -1469,6 +1493,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\source\main\cResourceHistory.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\source\main\cResourceLib.cc"
 				>
 			</File>

Modified: development/source/platform/tThreadSpecific.h
===================================================================
--- development/source/platform/tThreadSpecific.h	2008-12-13 22:03:15 UTC (rev 3036)
+++ development/source/platform/tThreadSpecific.h	2008-12-14 21:25:45 UTC (rev 3037)
@@ -69,7 +69,7 @@
   
   T* Get() { return m_value; }
   T* Set(T* value) { T* oldvalue = m_value; m_value = value; return oldvalue; }
-  void Set(T* value) { delete m_value; m_value = value; }
+  //void Set(T* value) { delete m_value; m_value = value; }
 };
 
 #endif