Merge pull request #30 from pachadotdev/compilationspeed

Compilationspeed

Author: pachadotdev

inst/include/cpp11/data_frame.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
-#include <cstdlib>  // for abs
-#include <cstdlib>
+#include <cstdlib>           // for abs
 #include <initializer_list>  // for initializer_list
 #include <string>            // for string, basic_string
 #include <utility>           // for move

inst/include/cpp11/external_pointer.hpp

@@ -38,7 +38,7 @@ class external_pointer {
 
     T* ptr = static_cast<T*>(R_ExternalPtrAddr(p));
 
-    if (ptr == NULL) {
+    if (ptr == nullptr) {
       return;
     }
 

inst/include/cpp11/function.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <string.h>  // for strcmp
+#include <cstring>  // for std::strcmp (@pachadotdev use std qualifiers)
 
 #include <cstdio>   // for snprintf
 #include <string>   // for string, basic_string

inst/include/cpp11/list.hpp

@@ -79,7 +79,8 @@ inline r_vector<SEXP>::r_vector(std::initializer_list<named_arg> il)
     : cpp11::r_vector<SEXP>(safe[Rf_allocVector](VECSXP, il.size())),
       capacity_(il.size()) {
   unwind_protect([&] {
-    SEXP names = Rf_allocVector(STRSXP, capacity_);
+    SEXP names;
+    PROTECT(names = Rf_allocVector(STRSXP, capacity_));
     Rf_setAttrib(data_, R_NamesSymbol, names);
 
     auto it = il.begin();
@@ -91,6 +92,8 @@ inline r_vector<SEXP>::r_vector(std::initializer_list<named_arg> il)
       SEXP name = Rf_mkCharCE(it->name(), CE_UTF8);
       SET_STRING_ELT(names, i, name);
     }
+
+    UNPROTECT(1);
   });
 }
 

inst/include/cpp11/r_vector.hpp

@@ -874,7 +874,8 @@ inline r_vector<T>::r_vector(std::initializer_list<named_arg> il)
   }
 
   unwind_protect([&] {
-    SEXP names = Rf_allocVector(STRSXP, capacity_);
+    SEXP names;
+    PROTECT(names = Rf_allocVector(STRSXP, capacity_));
     Rf_setAttrib(data_, R_NamesSymbol, names);
 
     auto it = il.begin();
@@ -899,6 +900,8 @@ inline r_vector<T>::r_vector(std::initializer_list<named_arg> il)
       SEXP name = Rf_mkCharCE(it->name(), CE_UTF8);
       SET_STRING_ELT(names, i, name);
     }
+
+    UNPROTECT(1);
   });
 }