From a80feb6c5fce7e1949e5ef4c67abd5d255a00514 Mon Sep 17 00:00:00 2001 From: marxin Date: Wed, 10 Jun 2015 07:57:34 +0000 Subject: Fix BITMAP identifier clash. PR bootstrap/66471 * mem-stats-traits.h (enum mem_alloc_origin): Add _ORIGIN suffix for all enum values in mem_alloc_origin. * alloc-pool.c (dump_alloc_pool_statistics): Use newly changed enum name. * alloc-pool.h (pool_allocator::pool_allocator): Likewise. * bitmap.c (bitmap_register): Likewise. (dump_bitmap_statistics): Likewise. * ggc-common.c (dump_ggc_loc_statistics): Likewise. (ggc_record_overhead): Likewise. * hash-map.h: Likewise. * hash-set.h: Likewise. * hash-table.c (void dump_hash_table_loc_statistics): Likewise. * hash-table.h: Likewise. * vec.c (vec_prefix::register_overhead): Likewise. (vec_prefix::release_overhead): Likewise. (dump_vec_loc_statistics): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224315 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/mem-stats-traits.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gcc/mem-stats-traits.h') diff --git a/gcc/mem-stats-traits.h b/gcc/mem-stats-traits.h index f7843f2165f..5d270474fc4 100644 --- a/gcc/mem-stats-traits.h +++ b/gcc/mem-stats-traits.h @@ -4,13 +4,13 @@ /* Memory allocation origin. */ enum mem_alloc_origin { - HASH_TABLE, - HASH_MAP, - HASH_SET, - VEC, - BITMAP, - GGC, - ALLOC_POOL, + HASH_TABLE_ORIGIN, + HASH_MAP_ORIGIN, + HASH_SET_ORIGIN, + VEC_ORIGIN, + BITMAP_ORIGIN, + GGC_ORIGIN, + ALLOC_POOL_ORIGIN, MEM_ALLOC_ORIGIN_LENGTH }; -- cgit v1.2.1