Skip to content

Commit

Permalink
Try to ignore clang warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed May 1, 2024
1 parent 18b378f commit af6ea83
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 0 deletions.
44 changes: 44 additions & 0 deletions patch/0003-Try-to-ignore-clang-warnings.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 56f582c4a3fbd6ab7d6bd3f2bc836029909e1c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Wed, 1 May 2024 11:12:44 +0200
Subject: [PATCH] Try to ignore clang warnings

---
src/duckdb/third_party/re2/re2/prog.h | 5 +++++
src/duckdb/third_party/re2/re2/walker-inl.h | 4 ++++
2 files changed, 9 insertions(+)

diff --git a/src/duckdb/third_party/re2/re2/prog.h b/src/duckdb/third_party/re2/re2/prog.h
index 29be811a..e27956b9 100644
--- a/src/duckdb/third_party/re2/re2/prog.h
+++ b/src/duckdb/third_party/re2/re2/prog.h
@@ -23,6 +23,11 @@
#include "re2/sparse_array.h"
#include "re2/sparse_set.h"

+// For CRAN
+# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
+# pragma clang diagnostic ignored "-Wnested-anon-types"
+// For CRAN
+
namespace duckdb_re2 {

// Opcodes for Inst
diff --git a/src/duckdb/third_party/re2/re2/walker-inl.h b/src/duckdb/third_party/re2/re2/walker-inl.h
index 1bbec1c1..635c0583 100644
--- a/src/duckdb/third_party/re2/re2/walker-inl.h
+++ b/src/duckdb/third_party/re2/re2/walker-inl.h
@@ -18,6 +18,10 @@
#include "util/logging.h"
#include "re2/regexp.h"

+// For CRAN
+# pragma clang diagnostic ignored "-Wdtor-name"
+// For CRAN
+
namespace duckdb_re2 {

template<typename T> struct WalkState;
--
2.43.0

5 changes: 5 additions & 0 deletions src/duckdb/third_party/re2/re2/prog.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
#include "re2/sparse_array.h"
#include "re2/sparse_set.h"

// For CRAN
# pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
# pragma clang diagnostic ignored "-Wnested-anon-types"
// For CRAN

namespace duckdb_re2 {

// Opcodes for Inst
Expand Down
4 changes: 4 additions & 0 deletions src/duckdb/third_party/re2/re2/walker-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
#include "util/logging.h"
#include "re2/regexp.h"

// For CRAN
# pragma clang diagnostic ignored "-Wdtor-name"
// For CRAN

namespace duckdb_re2 {

template<typename T> struct WalkState;
Expand Down

0 comments on commit af6ea83

Please sign in to comment.