diff --git a/apis/r/inst/include/tiledbsoma_types.h b/apis/r/inst/include/tiledbsoma_types.h index 27f327c085..ecbfb375d7 100644 --- a/apis/r/inst/include/tiledbsoma_types.h +++ b/apis/r/inst/include/tiledbsoma_types.h @@ -15,7 +15,7 @@ #define TILEDB_NO_API_DEPRECATION_WARNINGS #endif -#include // for C interface to Arrow +#include // for C interface to Arrow #include // for QueryCondition etc #define ARROW_SCHEMA_AND_ARRAY_DEFINED 1 #include diff --git a/apis/r/src/rinterface.cpp b/apis/r/src/rinterface.cpp index dba41a3566..c895b2f45e 100644 --- a/apis/r/src/rinterface.cpp +++ b/apis/r/src/rinterface.cpp @@ -1,6 +1,6 @@ #include // for R interface to C++ #include // for C interface to Arrow (via R package) -#include // for C/C++ interface to Arrow +#include // for C/C++ interface to Arrow #include // for fromInteger64 // we currently get deprecation warnings by default which are noisy diff --git a/apis/r/src/riterator.cpp b/apis/r/src/riterator.cpp index f0d9aa4692..9571fa7141 100644 --- a/apis/r/src/riterator.cpp +++ b/apis/r/src/riterator.cpp @@ -5,7 +5,7 @@ #include // for R interface to C++ #include // for C interface to Arrow (via R package nanoarrow) -#include +#include #include // for fromInteger64 #include diff --git a/apis/r/src/rutilities.cpp b/apis/r/src/rutilities.cpp index 7f58300d00..d7a86354c2 100644 --- a/apis/r/src/rutilities.cpp +++ b/apis/r/src/rutilities.cpp @@ -5,7 +5,7 @@ #endif #include // for R interface to C++ -#include // for C interface to Arrow +#include // for C interface to Arrow #include // for fromInteger64 #include diff --git a/apis/r/src/xptr-utils.h b/apis/r/src/xptr-utils.h index d5610bc9ac..847bab51a0 100644 --- a/apis/r/src/xptr-utils.h +++ b/apis/r/src/xptr-utils.h @@ -24,9 +24,6 @@ const tiledb_xptr_object tiledb_xptr_vlv_buf_t { 180 }; const tiledb_xptr_object tiledb_xptr_query_buf_t { 190 }; // the definitions above are internal to tiledb-r but we need a new value here if we want tag the external pointer -const tiledb_xptr_object tiledb_arrow_array_t { 300 }; -const tiledb_xptr_object tiledb_arrow_schema_t { 310 }; - const tiledb_xptr_object tiledb_soma_reader_t { 500 }; // templated checkers for external pointer tags @@ -52,10 +49,6 @@ template <> inline const int32_t XPtrTagType = til // template <> inline const int32_t XPtrTagType = tiledb_xptr_vlv_buf_t; // template <> inline const int32_t XPtrTagType = tiledb_xptr_query_buf_t; - -template <> inline const int32_t XPtrTagType = tiledb_arrow_array_t; -template <> inline const int32_t XPtrTagType = tiledb_arrow_schema_t; - template <> inline const int32_t XPtrTagType = tiledb_soma_reader_t; template Rcpp::XPtr make_xptr(T* p, bool finalize=true) { @@ -81,4 +74,3 @@ template void check_xptr_tag(Rcpp::XPtr ptr) { // in rinterface.cpp Rcpp::XPtr schema_owning_xptr(void); Rcpp::XPtr array_owning_xptr(void); - diff --git a/libtiledbsoma/cmake/inputs/tiledbsoma.pc.in b/libtiledbsoma/cmake/inputs/tiledbsoma.pc.in index f88500f416..342e30212e 100644 --- a/libtiledbsoma/cmake/inputs/tiledbsoma.pc.in +++ b/libtiledbsoma/cmake/inputs/tiledbsoma.pc.in @@ -9,6 +9,6 @@ URL: https://github.com/single-cell-data/TileDB-SOMA Version: @VERSION@ Requires: @PKGCONF_REQ_PUB@ Requires.private: @PKGCONF_REQ_PRIV@ -Cflags: -I"${includedir}" +Cflags: -I"${includedir}" -I"${includedir}/tiledbsoma" Libs: -L"${libdir}" -ltiledbsoma -Libs.private: -L"${libdir}" -ltiledbsoma @PKGCONF_LIBS_PRIV@ \ No newline at end of file +Libs.private: -L"${libdir}" -ltiledbsoma @PKGCONF_LIBS_PRIV@ diff --git a/libtiledbsoma/src/utils/arrow_adapter.h b/libtiledbsoma/src/utils/arrow_adapter.h index d0821dfc51..818f5cc370 100644 --- a/libtiledbsoma/src/utils/arrow_adapter.h +++ b/libtiledbsoma/src/utils/arrow_adapter.h @@ -8,7 +8,7 @@ // https://arrow.apache.org/docs/format/Columnar.html#buffer-listing-for-each-layout // https://arrow.apache.org/docs/format/CDataInterface.html#exporting-a-simple-int32-array -#include "tiledbsoma/nanoarrow/nanoarrow.hpp" +#include "nanoarrow/nanoarrow.hpp" namespace tiledbsoma {