Removing repetitive declarations.

R/lag.R

@@ -3,7 +3,7 @@
 #' @description
 #' Fast lags and leads
 #'
-#' @param x A vector.
+#' @param x A vector or data frame.
 #' @param n Number of lags. Negative values are accepted.
 #' @param fill Value used to fill first n values. Default is `NA`.
 #' @param set Should x be updated by reference? If `TRUE` no copy is made and

src/attrs.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 
 // Adding and removing attributes in-place
 // There is a check to ensure that attributes are copied when they are the same

src/cheapr_cpp.h

@@ -4,7 +4,10 @@
 #ifndef cheapr_cpp_funs
 #define cheapr_cpp_funs
 
+#ifndef R_NO_REMAP
 #define R_NO_REMAP
+#endif
+
 #define VECTOR_PTR(x) ((SEXP *) DATAPTR(x))
 #define VECTOR_PTR_RO(x) ((const SEXP*) DATAPTR_RO(x))
 

src/gcd.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 
 [[cpp11::register]]
 double cpp_gcd2(double x, double y, double tol, bool na_rm){

src/lag.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 
 [[cpp11::register]]
 SEXP cpp_lag(SEXP x, int k, SEXP fill, bool set, bool recursive) {

src/nas.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 
 R_xlen_t na_count(SEXP x, bool recursive){
   R_xlen_t n = Rf_xlength(x);

src/sequences.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 
 double r_sum(SEXP x, bool na_rm = false){
   cpp11::function base_sum = cpp11::package("base")["sum"];

src/set_math.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 
 // Basic math operations by reference
 // All NA and NaN values are ignored

src/sset.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 // #include <vector>
 // using namespace cpp11;
 

src/utils.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 
 int int_div(int x, int y){
   return x / y;

src/which.cpp

@@ -1,6 +1,4 @@
 #include "cheapr_cpp.h"
-#include <cpp11.hpp>
-#include <Rinternals.h>
 
 // A more memory-efficient which()
 // Author: Nick Christofides