[Avida-SVN] r3160 - in development: . Avida.xcodeproj source/analyze

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2009-02-25 13:15:33 -0500 (Wed, 25 Feb 2009)
New Revision: 3160

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/CMakeLists.txt
   development/source/analyze/cGenotypeData.h
   development/source/analyze/cModularityAnalysis.cc
Log:
Attempt to cleanup superfluous type conversion warnings under new versions of GCC.

Alter cGenotypeData ID generation to use an enum.

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2009-02-25 17:24:22 UTC (rev 3159)
+++ development/Avida.xcodeproj/project.pbxproj	2009-02-25 18:15:33 UTC (rev 3160)
@@ -2384,7 +2384,6 @@
 					"-Wno-unused-parameter",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
-					"-Wconversion",
 				);
 			};
 			name = Development;
@@ -2417,7 +2416,6 @@
 					"-Wextra",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
-					"-Wconversion",
 				);
 			};
 			name = Deployment;
@@ -2541,7 +2539,6 @@
 					"-Wextra",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
-					"-Wconversion",
 				);
 			};
 			name = "Deployment-G5";
@@ -2578,7 +2575,6 @@
 					"-Wno-unused-parameter",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
-					"-Wconversion",
 				);
 			};
 			name = Profile;
@@ -2713,7 +2709,6 @@
 					"-Wextra",
 					"-Wno-four-char-constants",
 					"-Wno-unknown-pragmas",
-					"-Wconversion",
 				);
 			};
 			name = "Deployment-Universal";

Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt	2009-02-25 17:24:22 UTC (rev 3159)
+++ development/CMakeLists.txt	2009-02-25 18:15:33 UTC (rev 3160)
@@ -45,7 +45,7 @@
       SET(COMPILER_WARNING_FLAGS "")
       SET(COMPILER_OPTIMIZATION_FLAGS "")
     ELSE (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
-      SET(COMPILER_WARNING_FLAGS "-Wextra -Wno-unknown-pragmas -Wconversion -Wno-trigraphs")
+      SET(COMPILER_WARNING_FLAGS "-Wextra -Wno-unknown-pragmas -Wno-trigraphs")
       SET(COMPILER_OPTIMIZATION_FLAGS "-ffast-math -fno-rtti -funroll-loops -fstrict-aliasing -ftree-vectorize -fvisibility-inlines-hidden")
     ENDIF (CMAKE_CXX_COMPILER MATCHES ".*icpc.*")
   ENDIF (CMAKE_CXX_COMPILER MATCHES ".*pathCC.*")

Modified: development/source/analyze/cGenotypeData.h
===================================================================
--- development/source/analyze/cGenotypeData.h	2009-02-25 17:24:22 UTC (rev 3159)
+++ development/source/analyze/cGenotypeData.h	2009-02-25 18:15:33 UTC (rev 3160)
@@ -32,4 +32,11 @@
   virtual ~cGenotypeData() = 0;
 };
 
+enum eGENOTYPE_DATA_IDS
+{
+  GD_MD_ID = 1,
+  
+  GD_DYNAMIC_ID_BASE
+};
+
 #endif

Modified: development/source/analyze/cModularityAnalysis.cc
===================================================================
--- development/source/analyze/cModularityAnalysis.cc	2009-02-25 17:24:22 UTC (rev 3159)
+++ development/source/analyze/cModularityAnalysis.cc	2009-02-25 18:15:33 UTC (rev 3160)
@@ -30,7 +30,6 @@
 #include "tDataCommandManager.h"
 #include "tDataEntry.h"
 
-static const int MD_ID = 1;
 
 void cModularityAnalysis::Initialize()
 {
@@ -218,19 +217,19 @@
     mod_data->sites_inv_x_tasks = sites_inv_x_tasks;
     mod_data->task_length = task_length;
     mod_data->ave_task_position = ave_task_position;
-    m_genotype->SetGenotypeData(MD_ID, mod_data);
+    m_genotype->SetGenotypeData(GD_MD_ID, mod_data);
   }
 }
 
 #ifdef DEBUG
 #define GET_MD() \
   cAnalyzeGenotype::ReadToken* tok = genotype->GetReadToken(); \
-  cModularityData* data = dynamic_cast<cModularityData*>(genotype->GetGenotypeData(tok, MD_ID)); \
+  cModularityData* data = dynamic_cast<cModularityData*>(genotype->GetGenotypeData(tok, GD_MD_ID)); \
   delete tok;
 #else
 #define GET_MD() \
   cAnalyzeGenotype::ReadToken* tok = genotype->GetReadToken(); \
-  cModularityData* data = static_cast<cModularityData*>(genotype->GetGenotypeData(tok, MD_ID)); \
+  cModularityData* data = static_cast<cModularityData*>(genotype->GetGenotypeData(tok, GD_MD_ID)); \
   delete tok;
 #endif