Changeset 6813 for trunk/TOOLS/arb_probe.cxx

Timestamp:

09/09/10 20:23:50 (21 months ago)

Author:

westram

Message:

• merged from refactor [6796] [6804] [6806] [6808]
  • added header for planned library ARB_CORE
  • renamed inline.h into arb_str.h
  • header for global general purpose defines/inlines (arb_defs.h)
    • use ARRAY_ELEMS where applicable
  • removed duplicate of ARB_strscmp (GBS_strscmp). No longer needed cause ARBDB is now C++

Files:

• trunk/TOOLS/arb_probe.cxx (modified) (5 diffs)

trunk/TOOLS/arb_probe.cxx

@@ -13 +13 @@
 #include <client.h>
 #include <servercntrl.h>
+#include <arb_defs.h>
 
 struct apd_sequence {
@@ -451 +452 @@
 }
 
-#define COUNT(array) sizeof(array)/sizeof(*array)
-
 void TEST_SLOW_match_probe() {
     const char *arguments[] = {
@@ -462 +461 @@
         "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);
 }
 
@@ -485 +484 @@
         "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);
 }
 
@@ -500 +499 @@
     "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);
 }