From c8aed844acdc89884d630c7e3266ecd8d4101847 Mon Sep 17 00:00:00 2001 From: bstarynk Date: Sat, 16 Apr 2016 17:02:56 +0000 Subject: 2016-04-16 Basile Starynkevitch {{merging with even more of GCC 6, using subversion 1.9 svn merge -r231651:232605 ^/trunk }} [gcc/] 2016-04-16 Basile Starynkevitch * melt/libmelt-ana-gimple.melt: (melt_build_transaction_with_label_norm): New inlined function, for gimple_transaction operator implementation... git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@235064 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/hash-map.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gcc/hash-map.h') diff --git a/gcc/hash-map.h b/gcc/hash-map.h index 510353bf4f7..2d184946a84 100644 --- a/gcc/hash-map.h +++ b/gcc/hash-map.h @@ -1,5 +1,5 @@ /* A type-safe hash map. - Copyright (C) 2014-2015 Free Software Foundation, Inc. + Copyright (C) 2014-2016 Free Software Foundation, Inc. This file is part of GCC. @@ -111,8 +111,9 @@ public: CXX_MEM_STAT_INFO) : m_table (n, ggc, gather_mem_stats, HASH_MAP_ORIGIN PASS_MEM_STAT) {} - hash_map (const hash_map &h, bool ggc = false, - bool gather_mem_stats = GATHER_STATISTICS CXX_MEM_STAT_INFO) + explicit hash_map (const hash_map &h, bool ggc = false, + bool gather_mem_stats = GATHER_STATISTICS + CXX_MEM_STAT_INFO) : m_table (h.m_table, ggc, gather_mem_stats, HASH_MAP_ORIGIN PASS_MEM_STAT) {} -- cgit v1.2.1