Skip to content

Commit bf18353

Browse files
committed
A bit of cleanup
1 parent 9662d72 commit bf18353

4 files changed

Lines changed: 1 addition & 14 deletions

File tree

‎r/PACKAGING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For a high-level overview of the Arrow release process see the [Apache Arrow Rel
2525
## Before the Arrow Release Candidate Is Created
2626

2727
- [ ] [Create a GitHub issue](https://github.com/apache/arrow/issues/new/) entitled `[R] CRAN packaging checklist for version X.Y.Z` and copy this checklist to the issue.
28-
- [ ] Review deprecated functions to advance their deprecation status, including removing preprocessor directives that no longer apply (search for `ARROW_VERSION_MAJOR` in r/src).
28+
- [ ] Review deprecated functions to advance their deprecation status.
2929
- [ ] Evaluate the status of any failing [nightly tests and nightly packaging builds](http://crossbow.voltrondata.com). These checks replicate most of the checks that CRAN runs, so we need them all to be passing or to understand that the failures may (though won't necessarily) result in a rejection from CRAN.
3030
- [ ] Check [current CRAN check results](https://cran.rstudio.org/web/checks/check_results_arrow.html).
3131
- [ ] Ensure the contents of the README are accurate and up to date.

‎r/src/altrep.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,8 @@ void DeletePointer(std::shared_ptr<T>* ptr) {
8080
template <typename T>
8181
using Pointer = cpp11::external_pointer<std::shared_ptr<T>, DeletePointer<T>>;
8282

83-
#if ARROW_VERSION_MAJOR >= 18
8483
using ChunkResolver = arrow::ChunkResolver;
8584
using ChunkLocation = arrow::ChunkLocation;
86-
#else
87-
using ChunkResolver = arrow::internal::ChunkResolver;
88-
using ChunkLocation = arrow::internal::ChunkLocation;
89-
#endif
9085

9186
class ArrowAltrepData {
9287
public:

‎r/src/extension-impl.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,7 @@ std::string RExtensionType::ToString(bool show_metadata) const {
100100
// In the event of an error (e.g., we are not on the main thread
101101
// and we are not inside RunWithCapturedR()), just call the default method
102102
if (!result.ok()) {
103-
#if ARROW_VERSION_MAJOR >= 16
104103
return ExtensionType::ToString(show_metadata);
105-
#else
106-
return ExtensionType::ToString();
107-
#endif
108104
} else {
109105
return result.ValueUnsafe();
110106
}

‎r/src/filesystem.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,11 +429,7 @@ std::shared_ptr<fs::GcsFileSystem> fs___GcsFileSystem__Make(bool anonymous,
429429
}
430430

431431
auto io_context = MainRThread::GetInstance().CancellableIOContext();
432-
#if ARROW_VERSION_MAJOR >= 18
433432
return ValueOrStop(fs::GcsFileSystem::Make(gcs_opts, io_context));
434-
#else
435-
return fs::GcsFileSystem::Make(gcs_opts, io_context);
436-
#endif
437433
}
438434

439435
// [[gcs::export]]

0 commit comments

Comments
 (0)