diff options
author | Jason Merrill <jason@redhat.com> | 2015-12-15 11:21:50 -0500 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2015-12-15 11:21:50 -0500 |
commit | 951c9e90e3c73a73dde3bbeb43a7bf882803b254 (patch) | |
tree | 265ab661b46554c6b41b1b672c767dd4a17d9092 | |
parent | 57e8ab2468e4ee93839e3bbe4e2a33b8d95dbe81 (diff) | |
download | gcc-951c9e90e3c73a73dde3bbeb43a7bf882803b254.zip gcc-951c9e90e3c73a73dde3bbeb43a7bf882803b254.tar.gz gcc-951c9e90e3c73a73dde3bbeb43a7bf882803b254.tar.bz2 |
* hash-map.h, hash-table.h: Make copy constructors explicit.
From-SVN: r231658
-rw-r--r-- | gcc/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/hash-map.h | 5 | ||||
-rw-r--r-- | gcc/hash-table.h | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 02c2117..c25b4ec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2015-12-15 Jason Merrill <jason@redhat.com> + + * hash-map.h, hash-table.h: Make copy constructors explicit. + 2015-12-15 Ilya Verbin <ilya.verbin@intel.com> * cgraphunit.c (output_in_order): Do not assemble "omp declare target diff --git a/gcc/hash-map.h b/gcc/hash-map.h index 510353b..f61b7ab 100644 --- a/gcc/hash-map.h +++ b/gcc/hash-map.h @@ -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) {} diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 53e72e6..5725372 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -365,10 +365,10 @@ public: bool gather_mem_stats = GATHER_STATISTICS, mem_alloc_origin origin = HASH_TABLE_ORIGIN CXX_MEM_STAT_INFO); - hash_table (const hash_table &, bool ggc = false, - bool gather_mem_stats = GATHER_STATISTICS, - mem_alloc_origin origin = HASH_TABLE_ORIGIN - CXX_MEM_STAT_INFO); + explicit hash_table (const hash_table &, bool ggc = false, + bool gather_mem_stats = GATHER_STATISTICS, + mem_alloc_origin origin = HASH_TABLE_ORIGIN + CXX_MEM_STAT_INFO); ~hash_table (); /* Create a hash_table in gc memory. */ |