ignore arrow warnings and foward declare arrow

This commit is contained in:
Thomas Fussell 2017-07-12 00:03:26 -07:00
parent 13cfbe914f
commit 0be7563f8b
3 changed files with 18 additions and 5 deletions

View File

@ -1,12 +1,15 @@
#include <iostream> #include <iostream>
#include <arrow/api.h>
#include <xlnt/xlnt_config.hpp> #include <xlnt/xlnt_config.hpp>
namespace arrow {
class Table;
}
namespace xlnt { namespace xlnt {
namespace arrow { namespace arrow {
void XLNT_API xlsx2arrow(std::istream &s, ::arrow::Table &table); void XLNT_API xlsx2arrow(std::istream &s, ::arrow::Table &table);
void XLNT_API arrow2xlsx(const ::arrow::Table &table, std::ostream &s); void XLNT_API arrow2xlsx(const ::arrow::Table &table, std::ostream &s);
} } // namespace arrow
} } // namespace xlnt

View File

@ -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 <arrow/api.h>
#pragma clang diagnostic pop
#include <xlnt/cell/cell.hpp> #include <xlnt/cell/cell.hpp>
#include <xlnt/cell/cell_reference.hpp> #include <xlnt/cell/cell_reference.hpp>
#include <xlnt/workbook/streaming_workbook_reader.hpp> #include <xlnt/workbook/streaming_workbook_reader.hpp>

View File

@ -1,9 +1,12 @@
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <xlnt/utils/xlntarrow.hpp>
#include <arrow/api.h>
#include <Python.h> // must be included after Arrow
#include <python_streambuf.hpp> #include <python_streambuf.hpp>
#include <Python.h> #include <xlnt/utils/xlntarrow.hpp>
PyObject *xlsx2arrow(PyObject *file) PyObject *xlsx2arrow(PyObject *file)
{ {