Skip to content

Commit 1f8e76c

Browse files
authored
Merge branch 'develop' into integration-clickhouse-benchmark-baseline
2 parents 42a591c + dbc1a24 commit 1f8e76c

4 files changed

Lines changed: 9 additions & 11 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ profile.json.gz
219219
# Clang compilation database (https://clang.llvm.org/docs/JSONCompilationDatabase.html)
220220
compile_commands.json
221221

222+
# Commands
223+
/justfile
224+
222225
# AI Agents
223226
.claude
224227
.opencode

vortex-duckdb/build.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -331,14 +331,7 @@ fn c2rust(crate_dir: &Path, duckdb_include_dir: &Path) {
331331
fn cpp(duckdb_include_dir: &Path) {
332332
cc::Build::new()
333333
.std("c++20")
334-
// Duckdb sources fail -Wno-unused-parameter and -Wno-type-limits
335-
.flags([
336-
"-Wall",
337-
"-Wextra",
338-
"-Wpedantic",
339-
"-Wno-unused-parameter",
340-
"-Wno-type-limits",
341-
])
334+
.flags(["-Wall", "-Wextra", "-Wpedantic"])
342335
.cpp(true)
343336
.include(duckdb_include_dir)
344337
.include("cpp/include")

vortex-duckdb/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if (NOT CMAKE_BUILD_TYPE)
2323
endif()
2424

2525
# Enable compiler warnings (matching build.rs flags).
26-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wno-type-limits")
26+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
2727

2828
# Find DuckDB include directory via the symlink created by build.rs.
2929
# The symlink points to target/duckdb-source-vX.Y.Z which contains duckdb-X.Y.Z/

vortex-duckdb/cpp/include/duckdb_vx/duckdb_diagnostics.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
_Pragma("GCC diagnostic push") \
1818
_Pragma("GCC diagnostic ignored \"-Wall\"") \
1919
_Pragma("GCC diagnostic ignored \"-Wextra\"") \
20-
_Pragma("GCC diagnostic ignored \"-Wpedantic\"")
20+
_Pragma("GCC diagnostic ignored \"-Wpedantic\"") \
21+
_Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \
22+
_Pragma("GCC diagnostic ignored \"-Wtype-limits\"")
2123
#define DUCKDB_INCLUDES_END _Pragma("GCC diagnostic pop")
2224
#else
2325
#define DUCKDB_INCLUDES_BEGIN
2426
#define DUCKDB_INCLUDES_END
2527
#endif
26-
// clang-format on
28+
// clang-format on

0 commit comments

Comments
 (0)