From 561525cbb538b030d28aa4951cf77c9f3f286954 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Tue, 18 Dec 2012 23:36:45 +0000 Subject: Rename allocator_glib to allocator_simple, since the block allocator also uses glib and 'simple' describes the intention far better. svn path=/trunk/; revision=46603 --- epan/wmem/wmem_scopes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/wmem/wmem_scopes.c') diff --git a/epan/wmem/wmem_scopes.c b/epan/wmem/wmem_scopes.c index 88e6028d32..9242659fa3 100644 --- a/epan/wmem/wmem_scopes.c +++ b/epan/wmem/wmem_scopes.c @@ -28,8 +28,8 @@ #include #include "wmem_scopes.h" -#include "wmem_allocator_glib.h" #include "wmem_allocator_block.h" +#include "wmem_allocator_simple.h" /* One of the supposed benefits of wmem over the old emem was going to be that * the scoping of the various memory pools would be obvious, since they would @@ -154,14 +154,14 @@ wmem_init_scopes(void) g_assert(in_file_scope == FALSE); if (getenv("WIRESHARK_DEBUG_WMEM_PACKET_NO_CHUNKS")) { - packet_scope = wmem_glib_allocator_new(); + packet_scope = wmem_simple_allocator_new(); } else { packet_scope = wmem_block_allocator_new(); } - file_scope = wmem_glib_allocator_new(); - epan_scope = wmem_glib_allocator_new(); + file_scope = wmem_simple_allocator_new(); + epan_scope = wmem_simple_allocator_new(); } void -- cgit v1.2.3