diff --git a/common/include/countarray.h b/common/include/countarray.h index d7ea31364..0a065dd46 100644 --- a/common/include/countarray.h +++ b/common/include/countarray.h @@ -35,7 +35,7 @@ public: typedef typename array_type::iterator iterator; typedef typename array_type::const_iterator const_iterator; typedef typename array_type::const_reference const_reference; - static typename array_type::size_type size() { return S; } + static typename array_type::size_type max_size() { return S; } ~count_array_t() { clear(); } count_array_t &operator=(const count_array_t &rhs) { diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index 975a796f7..1aa2006e9 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -2090,7 +2090,7 @@ static void init_boss_segments(const object &boss_objp, boss_special_segment_arr #if DXX_USE_EDITOR Selected_segs.emplace_back(csegnum); #endif - if (a.count() >= a.size()) + if (a.count() >= a.max_size()) { tail = head; sidenum=MAX_SIDES_PER_SEGMENT; diff --git a/similar/main/fvi.cpp b/similar/main/fvi.cpp index b33510e99..9d29d827e 100644 --- a/similar/main/fvi.cpp +++ b/similar/main/fvi.cpp @@ -716,7 +716,7 @@ int find_vector_intersection(const fvi_query &fq, fvi_info &hit_data) fvi_info::segment_array_t::iterator i = hit_data.seglist.find(hit_seg), e = hit_data.seglist.end(); if (i != e) hit_data.seglist.erase(++i); - else if (hit_data.seglist.count() < hit_data.seglist.size()) + else if (hit_data.seglist.count() < hit_data.seglist.max_size()) hit_data.seglist.emplace_back(hit_seg); } @@ -784,7 +784,7 @@ static void append_segments(fvi_info::segment_array_t &dst, const fvi_info::segm /* Avoid overflow. Original code had n_segs < MAX_SEGS_VISITED-1, * so leave an extra slot on min. */ - size_t scount = src.count(), dcount=dst.count(), count = std::min(scount, dst.size() - dcount - 1); + size_t scount = src.count(), dcount=dst.count(), count = std::min(scount, dst.max_size() - dcount - 1); std::copy(src.begin(), src.begin() + count, std::back_inserter(dst)); }