Skip to content

chore: only ignore c++ diagnostics for ddb headers #6970

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

Merged
0ax1 merged 1 commit into from
Mar 16, 2026
Merged

chore: only ignore c++ diagnostics for ddb headers #6970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 1 addition & 8 deletions vortex-duckdb/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,14 +325,7 @@ fn c2rust(crate_dir: &Path, duckdb_include_dir: &Path) {
fn cpp(duckdb_include_dir: &Path) {
cc::Build::new()
.std("c++20")
// Duckdb sources fail -Wno-unused-parameter and -Wno-type-limits
.flags([
"-Wall",
"-Wextra",
"-Wpedantic",
"-Wno-unused-parameter",
"-Wno-type-limits",
])
.flags(["-Wall", "-Wextra", "-Wpedantic"])
.cpp(true)
.include(duckdb_include_dir)
.include("cpp/include")
Expand Down
2 changes: 1 addition & 1 deletion vortex-duckdb/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (NOT CMAKE_BUILD_TYPE)
endif()

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

# Find DuckDB include directory via the symlink created by build.rs.
# The symlink points to target/duckdb-source-vX.Y.Z which contains duckdb-X.Y.Z/
Expand Down
6 changes: 4 additions & 2 deletions vortex-duckdb/cpp/include/duckdb_vx/duckdb_diagnostics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wall\"") \
_Pragma("GCC diagnostic ignored \"-Wextra\"") \
_Pragma("GCC diagnostic ignored \"-Wpedantic\"")
_Pragma("GCC diagnostic ignored \"-Wpedantic\"") \
_Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \
_Pragma("GCC diagnostic ignored \"-Wtype-limits\"")
#define DUCKDB_INCLUDES_END _Pragma("GCC diagnostic pop")
#else
#define DUCKDB_INCLUDES_BEGIN
#define DUCKDB_INCLUDES_END
#endif
// clang-format on
// clang-format on
Loading