Remove #defines, replace with enum

git-svn-id: svn://mattst88.com/svn/cleanbench/trunk@36 0d43b9a7-5ab2-4d7b-af9d-f64450cef757

1 files changed, 19 insertions, 16 deletions

diff --git a/cleanbench.h b/cleanbench.h
index 278de90..3efc5dd 100644
--- a/cleanbench.h
+++ b/cleanbench.h
@@ -80,20 +80,29 @@ char *compilerversion="Have a nice day";
 #define MAXPARAM 41
 
 /* Tests-to-do flags...must coincide with test. */
-#define TF_NUMSORT 0
-#define TF_SSORT 1
-#define TF_BITOP 2
-#define TF_FPEMU 3
-#define TF_FFPU 4
-#define TF_ASSIGN 5
-#define TF_IDEA 6
-#define TF_HUFF 7
-#define TF_NNET 8
-#define TF_LU 9
+enum {
+	NUMSORT,
+	STRINGSORT,
+	BITFIELD,
+	FPEMULATION,
+	FOURIER,
+	ASSIGNMENT,
+	IDEA,
+	HUFFMAN,
+	NEURAL,
+	LINEAR
+} tests_t;
 
 #define NUMTESTS 10
 
 /*
+** Following array is a collection of flags indicating which
+** tests to perform.
+*/
+int tests_to_do[NUMTESTS];
+
+
+/*
 ** GLOBALS
 */
 
@@ -193,12 +202,6 @@ char *paramnames[]= {
 	"ALIGN" };
 
 /*
-** Following array is a collection of flags indicating which
-** tests to perform.
-*/
-int tests_to_do[NUMTESTS];
-
-/*
 ** Buffer for holding output text.
 */
 char buffer[BUF_SIZ];