OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-29 10:21:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler issue when importing arrow

Browse Source 
The arrow library has a function parameter called signals that causes trouble when compiled using Qt. Add undef signals to avoid this issue.
This commit is contained in:
Magne Sjaastad 2024-07-01 12:34:47 +02:00
parent e0b84ae36a
commit 58b3f0b928
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/FileInterface/RifArrowTools.cpp
View File

@ -22,12 +22,6 @@
#include <vector> #include <vector>
// #include <arrow/array/array_primitive.h>
// #include <arrow/csv/api.h>
// #include <arrow/io/api.h>
// #include <arrow/scalar.h>
// #include <parquet/arrow/reader.h>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/FileInterface/RifArrowTools.h
View File

@ -18,7 +18,9 @@
#pragma once #pragma once
#undef signals
#include <arrow/array/array_primitive.h> #include <arrow/array/array_primitive.h>
#define signals Q_SIGNALS
#include <memory> #include <memory>
#include <vector> #include <vector>

2
ApplicationLibCode/FileInterface/RifByteArrayArrowRandomAccessFile.h
View File

@ -18,10 +18,12 @@
#pragma once #pragma once
#undef signals
#include <arrow/csv/api.h> #include <arrow/csv/api.h>
#include <arrow/io/api.h> #include <arrow/io/api.h>
#include <arrow/scalar.h> #include <arrow/scalar.h>
#include <parquet/arrow/reader.h> #include <parquet/arrow/reader.h>
#define signals Q_SIGNALS
#include <QByteArray> #include <QByteArray>

2
ApplicationLibCode/FileInterface/RifOsduWellLogReader.cpp
View File

@ -27,11 +27,13 @@
#include "RifArrowTools.h" #include "RifArrowTools.h"
#undef signals
#include <arrow/array/array_primitive.h> #include <arrow/array/array_primitive.h>
#include <arrow/csv/api.h> #include <arrow/csv/api.h>
#include <arrow/io/api.h> #include <arrow/io/api.h>
#include <arrow/scalar.h> #include <arrow/scalar.h>
#include <parquet/arrow/reader.h> #include <parquet/arrow/reader.h>
#define signals Q_SIGNALS
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

2
ApplicationLibCode/FileInterface/RifOsduWellPathReader.cpp
View File

@ -18,12 +18,14 @@
#include "RifOsduWellPathReader.h" #include "RifOsduWellPathReader.h"
#undef signals
#include <arrow/array/array_primitive.h> #include <arrow/array/array_primitive.h>
#include <arrow/csv/api.h> #include <arrow/csv/api.h>
#include <arrow/io/api.h> #include <arrow/io/api.h>
#include <arrow/scalar.h> #include <arrow/scalar.h>
#include <arrow/util/cancel.h> #include <arrow/util/cancel.h>
#include <parquet/arrow/reader.h> #include <parquet/arrow/reader.h>
#define signals Q_SIGNALS
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaTextStringTools.h" #include "RiaTextStringTools.h"

2
ApplicationLibCode/UnitTests/RifParquetReader-Test.cpp
View File

@ -2,10 +2,12 @@
#include "RiaTestDataDirectory.h" #include "RiaTestDataDirectory.h"
#undef signals
#include <arrow/csv/api.h> #include <arrow/csv/api.h>
#include <arrow/io/api.h> #include <arrow/io/api.h>
#include <arrow/scalar.h> #include <arrow/scalar.h>
#include <parquet/arrow/reader.h> #include <parquet/arrow/reader.h>
#define signals Q_SIGNALS
#include <QDir> #include <QDir>
#include <QString> #include <QString>

5
ApplicationLibCode/pch.h
View File

@ -16,11 +16,6 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// NOTE: This file must be included before any other Qt header files, as the keyword 'signals' is used as a parameter name in
// RegisterCancellingSignalHandler(const std::vector<int>& signals);
// Qt has special treatment of 'signals', and causes compiler issues using PCH
#include <arrow/util/cancel.h>
#include "cvfObject.h" #include "cvfObject.h"
#include "cvfVector3.h" #include "cvfVector3.h"