Skip to content

Commit

Permalink
Revert back to C++17 for now (#1246)
Browse files Browse the repository at this point in the history
  • Loading branch information
mlw authored Nov 30, 2023
1 parent 84e6d6c commit 2b5d557
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ build --copt=-Wno-error=deprecated-declarations
# isn't recognized on older SDKs
build --copt=-Wno-unknown-warning-option
build --copt=-Wno-error=deprecated-non-prototype
build --per_file_copt=.*\.mm\$@-std=c++20
build --cxxopt=-std=c++20
build --host_cxxopt=-std=c++20
build --per_file_copt=.*\.mm\$@-std=c++17
build --cxxopt=-std=c++17
build --host_cxxopt=-std=c++17

build --copt=-DSANTA_OPEN_SOURCE=1
build --cxxopt=-DSANTA_OPEN_SOURCE=1
Expand Down
5 changes: 3 additions & 2 deletions Source/common/SantaCacheTest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#import <XCTest/XCTest.h>

#include <compare>
#include <numeric>
#include <string>
#include <vector>
Expand Down Expand Up @@ -246,7 +245,9 @@ - (void)testCompareAndSwap {
uint64_t first_val;
uint64_t second_val;

auto operator<=>(const S &rhs) const = default;
bool operator==(const S &rhs) const {
return first_val == rhs.first_val && second_val == rhs.second_val;
}
};
template <>
uint64_t SantaCacheHasher<S>(S const &s) {
Expand Down

0 comments on commit 2b5d557

Please sign in to comment.