Changeset 8315

Timestamp:

20/12/11 15:54:35 (5 months ago)

Author:

westram

Message:

• wrapped some UNIT_TESTS / DEBUG code

Location:

trunk

Files:

• ARBDB/adGene.cxx (modified) (2 diffs)
• ARBDB/adhash.cxx (modified) (5 diffs)
• NTREE/NT_extern.cxx (modified) (3 diffs)

trunk/ARBDB/adGene.cxx

@@ -72 +72 @@
 }
 
+#if defined(UNIT_TESTS)
 static GBDATA* GEN_create_nonexisting_gene_rel_gene_data(GBDATA *gb_gene_data, const char *name) {
     GB_ERROR  error   = GB_push_transaction(gb_gene_data);
@@ -89 +90 @@
     return gb_gene;
 }
+#endif
 
 GBDATA* GEN_find_or_create_gene_rel_gene_data(GBDATA *gb_gene_data, const char *name) {

trunk/ARBDB/adhash.cxx

@@ -384 +384 @@
 
 
-static void GBS_string_2_hashtab(GB_HASH *hash, char *data) { // modifies data
+#if defined(UNIT_TESTS)
+static void GBS_string_2_hashtab(GB_HASH *hash, char *data) { // currently only used in unit tests below
+    // modifies data
     char *p, *d, *dp;
     int   c;
@@ -424 +426 @@
     }
 }
+#endif
 
 static gbs_hash_entry *find_hash_entry(const GB_HASH *hs, const char *key, size_t *index) {
@@ -743 +746 @@
 }
 
+#if defined(UNIT_TESTS)
 static size_t GBS_hash_count_value(GB_HASH *hs, long val) {
     size_t hsize    = hs->size;
@@ -759 +763 @@
     return count;
 }
+#endif
 
 const char *GBS_hash_next_element_that(GB_HASH *hs, const char *last_key, bool (*condition)(const char *key, long val, void *cd), void *cd) {
@@ -895 +900 @@
 }
 
+#if defined(UNIT_TESTS)
 static long GBS_numhash_count_elems(GB_NUMHASH *hs) {
     return hs->nelem;
 }
+#endif
 
 static void GBS_erase_numhash(GB_NUMHASH *hs) {

trunk/NTREE/NT_extern.cxx

@@ -871 +871 @@
 }
 
+#if defined(DEBUG)
 static void NT_fix_database(AW_window *) {
     GB_ERROR err = 0;
@@ -876 +877 @@
     if (err) aw_message(err);
 }
+#endif
 
 static void relink_pseudo_species_to_organisms(GBDATA *&ref_gb_node, char *&ref_name, GB_HASH *organism_hash) {
@@ -990 +992 @@
 // --------------------------------------------------------------------------------------------------
 
-static void NT_alltree_remove_leafs(AW_window *, AW_CL cl_mode, AW_CL cl_gb_main) {
+static void NT_alltree_remove_leafs(AW_window *, AW_CL cl_mode, AW_CL cl_gb_main) { // @@@ test and activate for public
     GBDATA               *gb_main = (GBDATA*)cl_gb_main;
     GBT_TREE_REMOVE_TYPE  mode    = (GBT_TREE_REMOVE_TYPE)cl_mode;