From 0be7563f8b429869785b1b2338b9b251a143460c Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Wed, 12 Jul 2017 00:03:26 -0700 Subject: [PATCH] ignore arrow warnings and foward declare arrow --- include/xlnt/utils/xlntarrow.hpp | 9 ++++++--- source/utils/xlntarrow.cpp | 7 +++++++ xlntpyarrow/xlntpyarrow.cpp | 7 +++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/include/xlnt/utils/xlntarrow.hpp b/include/xlnt/utils/xlntarrow.hpp index d46c2199..c42e8a56 100644 --- a/include/xlnt/utils/xlntarrow.hpp +++ b/include/xlnt/utils/xlntarrow.hpp @@ -1,12 +1,15 @@ #include -#include #include +namespace arrow { +class Table; +} + namespace xlnt { namespace arrow { void XLNT_API xlsx2arrow(std::istream &s, ::arrow::Table &table); void XLNT_API arrow2xlsx(const ::arrow::Table &table, std::ostream &s); -} -} +} // namespace arrow +} // namespace xlnt diff --git a/source/utils/xlntarrow.cpp b/source/utils/xlntarrow.cpp index db33a39e..a75704d8 100644 --- a/source/utils/xlntarrow.cpp +++ b/source/utils/xlntarrow.cpp @@ -1,3 +1,10 @@ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wsign-conversion" +#pragma clang diagnostic ignored "-Wswitch-enum" +#pragma clang diagnostic ignored "-Wshadow" +#include +#pragma clang diagnostic pop + #include #include #include diff --git a/xlntpyarrow/xlntpyarrow.cpp b/xlntpyarrow/xlntpyarrow.cpp index e2dbc634..5dd9027c 100644 --- a/xlntpyarrow/xlntpyarrow.cpp +++ b/xlntpyarrow/xlntpyarrow.cpp @@ -1,9 +1,12 @@ #include #include #include -#include + +#include +#include // must be included after Arrow + #include -#include +#include PyObject *xlsx2arrow(PyObject *file) {