update multiset testing

sunuslee · Oct 5, 2011 · 3a799f5 · 3a799f5
1 parent 62a0ece
commit 3a799f5
Show file tree

Hide file tree

Showing 5 changed files with 346 additions and 1 deletion.
diff --git a/cstl/cstl_alloc.h b/cstl/cstl_alloc.h
@@ -64,6 +64,7 @@ typedef struct _tagalloc
 
 typedef struct _tagalloc
 {
+    int n_avoid_vc_error_c2016;
 }_alloc_t;
 
 #endif /* CSTL_MEMORY_MANAGEMENT */

diff --git a/src/cstl_types.c b/src/cstl_types.c
@@ -104,7 +104,7 @@
 #ifdef CSTL_MEMORY_MANAGEMENT
 static _typeregister_t _gt_typeregister = {false, {NULL}, {{NULL}, NULL, NULL, 0, 0, 0}};
 #else
-static _typeregister_t _gt_typeregister = {false, {NULL}, {}};
+static _typeregister_t _gt_typeregister = {false, {NULL}, {0}};
 #endif
 
 /** local data type declaration and local struct, union, enum section **/

diff --git a/test/ut/ut_cstl_map.c b/test/ut/ut_cstl_map.c
@@ -31,9 +31,15 @@ void test_map_init__non_created(void** state)
 {
     map_t* pt_map = create_map(int, int);
 
+#ifdef CSTL_MAP_AVL_TREE
+    pt_map->_t_tree._t_avltree._un_height = 5;
+    expect_assert_failure(map_init(pt_map));
+    pt_map->_t_tree._t_avltree._un_height = 0;
+#else
     pt_map->_t_tree._t_rbroot._t_color = BLACK;
     expect_assert_failure(map_init(pt_map));
     pt_map->_t_tree._t_rbroot._t_color = RED;
+#endif
 
     map_destroy(pt_map);
 }