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

Support clang 18 #801

Merged
merged 3 commits into from
Jan 26, 2025
Merged

Support clang 18 #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38cdedc
Bump fmt
rmboyce Jan 24, 2025
5297ddd
Update other files
rmboyce Jan 24, 2025
295bcf7
Fix fmt::join error
rmboyce Jan 24, 2025
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
1 change: 1 addition & 0 deletions src/common/util/string_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include "common/util/string_util.h"
#include "fmt/format.h"
#include "fmt/ranges.h"

namespace bustub {

Expand Down
1 change: 1 addition & 0 deletions src/include/binder/expressions/bound_column_ref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include "binder/bound_expression.h"
#include "common/macros.h"
#include "fmt/ranges.h"

namespace bustub {

Expand Down
1 change: 1 addition & 0 deletions src/include/execution/expressions/array_expression.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "common/exception.h"
#include "execution/expressions/abstract_expression.h"
#include "fmt/ranges.h"
#include "type/value_factory.h"

namespace bustub {
Expand Down
1 change: 1 addition & 0 deletions src/primer/orset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <vector>
#include "common/exception.h"
#include "fmt/format.h"
#include "fmt/ranges.h"

namespace bustub {

Expand Down
2 changes: 1 addition & 1 deletion src/type/timestamp_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ auto TimestampType::ToString(const Value &val) const -> std::string {
tm /= 100000;
auto year = static_cast<uint16_t>(tm % 10000);
tm /= 10000;
auto tz = static_cast<int>(tm % 27);
auto tz = static_cast<int8_t>(tm % 27);
tz -= 12;
tm /= 27;
auto day = static_cast<uint16_t>(tm % 32);
Expand Down
1 change: 1 addition & 0 deletions src/type/vector_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include "common/exception.h"
#include "common/macros.h"
#include "fmt/ranges.h"
#include "type/type_id.h"
#include "type/type_util.h"
#include "type/vector_type.h"
Expand Down
1 change: 1 addition & 0 deletions test/txn/txn_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "execution/execution_common.h"
#include "fmt/core.h"
#include "fmt/format.h"
#include "fmt/ranges.h"
#include "gtest/gtest.h"
#include "storage/disk/disk_manager_memory.h"
#include "storage/index/b_plus_tree.h"
Expand Down
6 changes: 6 additions & 0 deletions third_party/fmt/.clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ IndentPPDirectives: AfterHash
IndentCaseLabels: false
AlwaysBreakTemplateDeclarations: false
DerivePointerAlignment: false
AllowShortCaseLabelsOnASingleLine: true
AlignConsecutiveShortCaseStatements:
Enabled: true
AcrossEmptyLines: true
AcrossComments: true
AlignCaseColons: false
Loading
Loading