From 049a1ec8f6ce7faf4d7135a0dfecd02b59a1d751 Mon Sep 17 00:00:00 2001 From: joaquintides Date: Fri, 7 Oct 2022 16:32:57 +0200 Subject: [PATCH] reverted b3754b10c885cc396d36ce7440a9e02adc6275c2 and 5fc929b829ab73cbed06702b035c1b8085cce057 and s/{}/() in arrays initialization --- include/boost/unordered/detail/foa.hpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/include/boost/unordered/detail/foa.hpp b/include/boost/unordered/detail/foa.hpp index d88f559e..595fdf3e 100644 --- a/include/boost/unordered/detail/foa.hpp +++ b/include/boost/unordered/detail/foa.hpp @@ -855,12 +855,9 @@ public: std::size_t n=0,const Hash& h_=Hash(),const Pred& pred_=Pred(), const Allocator& al_=Allocator()): hash_base{empty_init,h_},pred_base{empty_init,pred_}, - allocator_base{empty_init,al_},size_{0} - { - /* GCC 4.8/4.9 emits funky errors if cted at initializer list */ - arrays=new_arrays(n); - ml=max_load(); - } + allocator_base{empty_init,al_},size_{0},arrays(new_arrays(n)), + ml{max_load()} + {} table(const table& x): table(x,alloc_traits::select_on_container_copy_construction(x.al())){} @@ -874,7 +871,7 @@ public: hash_base{empty_init,std::move(x.h())}, pred_base{empty_init,std::move(x.pred())}, allocator_base{empty_init,std::move(x.al())}, - size_{x.size_},arrays{x.arrays},ml{x.ml} + size_{x.size_},arrays(x.arrays),ml{x.ml} { x.size_=0; x.arrays=x.new_arrays(0); @@ -883,13 +880,11 @@ public: table(const table& x,const Allocator& al_): hash_base{empty_init,x.h()},pred_base{empty_init,x.pred()}, - allocator_base{empty_init,al_},size_{0} + allocator_base{empty_init,al_},size_{0}, + arrays( + new_arrays(std::size_t(std::ceil(static_cast(x.size())/mlf)))), + ml{max_load()} { - /* GCC 4.8/4.9 emits funky errors if cted at initializer list */ - arrays= - new_arrays(std::size_t(std::ceil(static_cast(x.size())/mlf))); - ml=max_load(); - BOOST_TRY{ x.for_all_elements([this](value_type* p){ unchecked_insert(*p);