[ARROW-9855] [R] Fix bad merge/Rcpp conflict

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 2.0.0
• Component/s: R
• Labels: pull-request-available
• External issue URL: https://github.com/apache/arrow/issues/25893
• Assignee: Neal Richardson
• Reporter: Neal Richardson
• Created: 25/Aug/20 18:11
• Updated: 11/Jan/23 08:09
• Resolved: 25/Aug/20 18:47

Description

ARROW-8001 merged after the switch to cpp11 but was based on master before it, so that brought some generated code that still referenced Rcpp

Issue Links

• links to: GitHub Pull Request #8053