From ee1a9fba5b62bf485c0b85d74c0997f786e64048 Mon Sep 17 00:00:00 2001 From: Shard Gupta Date: Mon, 3 Mar 2025 12:53:37 +0000 Subject: [PATCH] Ignore -Woverloaded-virtual coming from antlr lib Signed-off-by: Shard Gupta --- contrib/babelfishpg_tsql/src/collation.c | 2 +- .../babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/babelfishpg_tsql/src/collation.c b/contrib/babelfishpg_tsql/src/collation.c index 62168656adf..44bda8ecdf8 100644 --- a/contrib/babelfishpg_tsql/src/collation.c +++ b/contrib/babelfishpg_tsql/src/collation.c @@ -1485,7 +1485,7 @@ icu_compare_utf8_coll(UCollator *coll, UChar *uchar1, int32_t ulen1, if (is_cs_ai_range_cmp) { - collator = ucol_clone(coll, &status); + collator = ucol_safeClone(coll, NULL, NULL, &status); if (U_FAILURE(status)) ereport(ERROR, diff --git a/contrib/babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp b/contrib/babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp index fd86e02bc90..40f37c631b8 100644 --- a/contrib/babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp +++ b/contrib/babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp @@ -4,7 +4,13 @@ #pragma GCC diagnostic ignored "-Wattributes" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Woverloaded-virtual" +extern "C" { #include "antlr4-runtime.h" // antlr4-cpp-runtime +} +#pragma GCC diagnostic pop + #include "tree/ParseTreeWalker.h" // antlr4-cpp-runtime #include "tree/ParseTreeProperty.h" // antlr4-cpp-runtime