crimson/osd: do not check HAVE_STDLIB_MAP_SPLICING

seastar always uses GCC-9 and up, so there is no need to check for the existence of map::merge() before using it anymore. Signed-off-by: Kefu Chai <[email protected]>
areed · Nov 1, 2020 · 6656cae · 6656cae
1 parent 038750c
commit 6656cae
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
@@ -163,13 +163,7 @@ void ShardServices::remove_want_pg_temp(pg_t pgid)
 
 void ShardServices::_sent_pg_temp()
 {
-#ifdef HAVE_STDLIB_MAP_SPLICING
   pg_temp_pending.merge(pg_temp_wanted);
-#else
-  pg_temp_pending.insert(make_move_iterator(begin(pg_temp_wanted)),
-			 make_move_iterator(end(pg_temp_wanted)));
-#endif
-  pg_temp_wanted.clear();
 }
 
 void ShardServices::requeue_pg_temp()