Skip to content

Commit 3041642

Browse files
committed
Bump to C++17
1 parent d73fecd commit 3041642

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
55
project(IndexStoreDB
66
LANGUAGES C CXX Swift)
77

8-
set(CMAKE_CXX_STANDARD 14)
8+
set(CMAKE_CXX_STANDARD 17)
99
set(CMAKE_CXX_STANDARD_REQUIRED YES)
1010
set(CMAKE_CXX_EXTENSIONS NO)
1111

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,5 @@ let package = Package(
142142
]),
143143
],
144144

145-
cxxLanguageStandard: .cxx14
145+
cxxLanguageStandard: .cxx17
146146
)

lib/Index/IndexDatastore.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,13 +1003,12 @@ void UnitMonitor::markOutOfDate(OutOfDateFileTriggerRef trigger,
10031003
// Note we have to be careful with the memory management here since the
10041004
// key for OutOfDateTriggers is a reference into the stored trigger value.
10051005
sys::ScopedLock L(StateMtx);
1006-
auto iterAndInserted =
1006+
auto [iter, inserted] =
10071007
OutOfDateTriggers.try_emplace(trigger->getPathRef(), trigger);
1008-
if (!iterAndInserted.second) {
1008+
if (!inserted) {
10091009
// If we have the same or newer mod time for this trigger already stored,
10101010
// we've seen it before, and have already informed the delegate that the
10111011
// unit is out of date.
1012-
auto iter = iterAndInserted.first;
10131012
if (iter->second->getModTime() >= trigger->getModTime())
10141013
return;
10151014

0 commit comments

Comments
 (0)