Changeset 6806 for branches/refactor/TOOLS/arb_probe.cxx

Timestamp:

08/09/10 11:41:12 (21 months ago)

Author:

westram

Message:

• header for global general purpose defines/inlines
• use ARRAY_ELEMS where applicable

Files:

• branches/refactor/TOOLS/arb_probe.cxx (modified) (5 diffs)

branches/refactor/TOOLS/arb_probe.cxx

@@ -13 +13 @@
 #include <client.h>
 #include <servercntrl.h>
+#include <arb_defs.h>
 
 struct apd_sequence {
@@ -487 +488 @@
 }
 
-#define COUNT(array) sizeof(array)/sizeof(*array)
-
 void TEST_SLOW_match_probe() {
     const char *arguments[] = {
@@ -498 +497 @@
         "BcSSSS00\1" "  BcSSSS00            0     0  0.0   2 0   .......UU-===============-UCAAGUCGA\1";
 
-    test_arb_probe(COUNT(arguments), arguments, expected);
+    test_arb_probe(ARRAY_ELEMS(arguments), arguments, expected);
 }
 
@@ -521 +520 @@
         "AUCAAGUCGAGCGAUGAA 18 B-     1   16    4 44.4 52.0    UUCAUCGCUCGACUUGAU |  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  2,  3,\n";
 
-    test_arb_probe(COUNT(arguments), arguments, expected);
+    test_arb_probe(ARRAY_ELEMS(arguments), arguments, expected);
 }
 
@@ -536 +535 @@
     "ClfPerfr\1" "  ClfPerfr            0     0  0.0  17 0   AGAGUUUGA-==================-UUUCCUUCG\1";
 
-    test_arb_probe(COUNT(arguments), arguments, expected);
+    test_arb_probe(ARRAY_ELEMS(arguments), arguments, expected);
 }