aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wmem/wmem_core.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-12-19 04:30:02 +0000
committerGuy Harris <guy@alum.mit.edu>2012-12-19 04:30:02 +0000
commit292b386089e88d8d3356342698229aa9d8e2c297 (patch)
treed8ac0d6ee78d4fdf34aba63b2838a4134ee20649 /epan/wmem/wmem_core.c
parentcb994b4f805a4098d8b42555cf24befd11adce40 (diff)
See if *this* squelches the MSVC errors.
svn path=/trunk/; revision=46611
Diffstat (limited to 'epan/wmem/wmem_core.c')
-rw-r--r--epan/wmem/wmem_core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/wmem/wmem_core.c b/epan/wmem/wmem_core.c
index 4fba760035..c3006b0125 100644
--- a/epan/wmem/wmem_core.c
+++ b/epan/wmem/wmem_core.c
@@ -80,10 +80,11 @@ wmem_allocator_new(const wmem_allocator_type_t type)
return wmem_block_allocator_new();
default:
g_assert_not_reached();
+ /* This is necessary to squelch MSVC errors; is there
+ any way to tell it that g_assert_not_reached()
+ never returns? */
+ return NULL;
};
-
- /* This is doubly not-reachable, but MSVC gets confused otherwise... */
- g_assert_not_reached();
}
void