Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix clang compilation #5172

Merged
merged 8 commits into from
Dec 30, 2022
+3 −6
Merged

Fix clang compilation #5172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f9d717
Fix clang compilation
Aiee Dec 30, 2022
54bd80d
Add ubuntu2004 back to the workflow
Aiee Dec 30, 2022
67205f6
Merge branch 'master' into fix-clang
czpmango Dec 30, 2022
e81cc93
Merge branch 'master' into fix-clang
Sophie-Xie Dec 30, 2022
4128f44
fix build with clang
codesigner Dec 30, 2022
3bd72c4
Merge branch 'master' into fix-clang
codesigner Dec 30, 2022
985b33d
fix build with clang
codesigner Dec 30, 2022
d1e3831
fix build with clang
codesigner Dec 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
matrix:
os:
- centos7
# - ubuntu2004
- ubuntu2004
compiler:
- gcc-9.3
- clang-10
Expand Down
2 changes: 1 addition & 1 deletion src/common/memory/MemoryUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ StatusOr<bool> MemoryUtils::hitsHighWatermark() {
int64_t now = time::WallClock::fastNowInSec();
if (now - kLastPurge_ > FLAGS_memory_purge_interval_seconds) {
// mallctl seems has issue with address_sanitizer, do purge only when address_sanitizer is off
#if defined(__clang)
#if defined(__clang__)
#if defined(__has_feature)
#if not __has_feature(address_sanitizer)
mallctl("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge", nullptr, nullptr, nullptr, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/common/memory/NewDelete.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/// 2. address_sanitizer is off
/// sanitizer has already override the new/delete operator,
/// only override new/delete operator only when address_sanitizer is off
#if defined(__clang)
#if defined(__clang__)
#if defined(__has_feature)
#if not __has_feature(address_sanitizer)
#define ENABLE_MEMORY_TRACKER
Expand Down
3 changes: 0 additions & 3 deletions src/graph/validator/AdminValidator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,6 @@ class KillSessionValidator final : public Validator {
private:
Status validateImpl() override;
Status toPlan() override;

private:
SessionID sessionId_{-1};
};

class GetSessionValidator final : public Validator {
Expand Down