follow up from @wesm comments on apache#2489

romainfrancois · Sep 7, 2018 · 79c5001 · 79c5001
1 parent a1a5e7c
commit 79c5001
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 202 deletions.
diff --git a/r/DESCRIPTION b/r/DESCRIPTION
@@ -1,10 +1,11 @@
 Package: arrow
-Title: Bindings to 'Apache' 'Arrow'
+Title: R Integration to 'Apache' 'Arrow'
 Version: 0.0.0.9000
 Authors@R: c(
-    person("Romain", "François", email = "[email protected]", role = c("aut", "cre"))
+    person("Romain", "François", email = "[email protected]", role = c("aut", "cre")), 
+    person("Apache Arrow", email = "[email protected]", role = c("aut", "cph"))
   )
-Description: R bindings to Apache Arrow.
+Description: R Integration to 'Apache' 'Arrow'.
 Depends: R (>= 3.5)
 License: Apache License (>= 2.0)
 Encoding: UTF-8

diff --git a/r/LICENSE.md b/r/LICENSE.md
diff --git a/r/README.Rmd b/r/README.Rmd
@@ -14,7 +14,7 @@ knitr::opts_chunk$set(
 ```
 # arrow
 
-Low level bindings to the C++ Apache Arrow library
+R integration with Apache Arrow.
 
 ## Installation
 

diff --git a/r/README.md b/r/README.md
@@ -3,7 +3,7 @@
 
 # arrow
 
-Low level bindings to the C++ Apache Arrow library
+R integration with Apache Arrow.
 
 ## Installation
 

diff --git a/r/src/hello.cpp b/r/src/hello.cpp
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <Rcpp.h>
-#include "rrrow_types.h"
+#include "r_arrow_types.h"
 
 using namespace Rcpp ;
 using namespace arrow ;

diff --git a/r/src/rrrow_types.h → r/src/r_arrow_types.h b/r/src/rrrow_types.h → r/src/r_arrow_types.h
@@ -17,6 +17,6 @@
 
 #pragma once
 
+#define STRICT_R_HEADERS
 #include <Rcpp.h>
-#undef Free
 #include <arrow/api.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ knitr::opts_chunk$set( @@
     ```
     # arrow
-    Low level bindings to the C++ Apache Arrow library
+    R integration with Apache Arrow.
     ## Installation
@@ Expand Down @@