Changeset 6813 for trunk/SL/FAST_ALIGNER/fast_aligner.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/SL/FAST_ALIGNER/fast_aligner.cxx (modified) (3 diffs)

trunk/SL/FAST_ALIGNER/fast_aligner.cxx

@@ -18 +18 @@
 
 #include <awtc_next_neighbours.hxx>
-
 #include <awt_sel_boxes.hxx>
 
@@ -25 +24 @@
 
 #include <arbdbt.h>
+
+#include <arb_defs.h>
 
 #include <cctype>
@@ -2969 +2970 @@
 }
 
-#define TEST_SPECIES_COUNT(test_ali_data) (sizeof(test_ali_data)/sizeof(*test_ali_data))
-#define TEST_CREATE_DB(error, test_ali_data) test_create_DB(error, test_ali_data, TEST_SPECIES_COUNT(test_ali_data))
+#define TEST_SPECIES_COUNT(test_ali_data)   ARRAY_ELEMS(test_ali_data)
+#define TEST_CREATE_DB(error,test_ali_data) test_create_DB(error, test_ali_data, TEST_SPECIES_COUNT(test_ali_data))
 
 static const char *get_aligned_data_of(GBDATA *gb_main, const char *species_name) {