summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy Chernyshov <thegeorg@yandex-team.ru>2022-03-02 17:41:02 -0800
committerAndrew Kryczka <andrewkr@fb.com>2022-03-29 12:54:19 -0700
commitda11a59034584ea2d0911268b8136e5249d6b692 (patch)
tree37162fc31d1e1589e712375dda4d17af727a7bf6
parent13a03a5452d8859a00c7c8283437a90573b01cba (diff)
Do not rely on ADL when invoking std::max_element (#9608)v6.29.5
Summary: Certain STLs use raw pointers and ADL does not work for them. Pull Request resolved: https://github.com/facebook/rocksdb/pull/9608 Reviewed By: ajkr Differential Revision: D34583012 Pulled By: riversand963 fbshipit-source-id: 7de6bbc8a080c3e7243ce0d758fe83f1663168aa
-rw-r--r--db/external_sst_file_ingestion_job.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/db/external_sst_file_ingestion_job.cc b/db/external_sst_file_ingestion_job.cc
index e1e873396..e6ea590f2 100644
--- a/db/external_sst_file_ingestion_job.cc
+++ b/db/external_sst_file_ingestion_job.cc
@@ -773,10 +773,11 @@ Status ExternalSstFileIngestionJob::AssignLevelAndSeqnoForIngestedFile(
const std::vector<FileMetaData*>& level_files =
vstorage->LevelFiles(lvl);
const SequenceNumber level_largest_seqno =
- (*max_element(level_files.begin(), level_files.end(),
- [](FileMetaData* f1, FileMetaData* f2) {
- return f1->fd.largest_seqno < f2->fd.largest_seqno;
- }))
+ (*std::max_element(level_files.begin(), level_files.end(),
+ [](FileMetaData* f1, FileMetaData* f2) {
+ return f1->fd.largest_seqno <
+ f2->fd.largest_seqno;
+ }))
->fd.largest_seqno;
// should only assign seqno to current level's largest seqno when
// the file fits