From f9ad0a7588bd8ed79c71f5cd44d3183cbe048f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Wed, 26 Jun 2024 09:14:50 +0200 Subject: [PATCH] Rf_ --- src/value_conversion.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/value_conversion.h b/src/value_conversion.h index 0992b7d..4aa71c2 100644 --- a/src/value_conversion.h +++ b/src/value_conversion.h @@ -35,7 +35,7 @@ class PointerWrapper { static SEXP Wrap( void* ptr) { // TODO cache this string? - auto ptr_sexp = R_MakeExternalPtr(ptr, Rf_ScalarString(mkChar(NAME.value)), R_NilValue); + auto ptr_sexp = R_MakeExternalPtr(ptr, Rf_ScalarString(Rf_mkChar(NAME.value)), R_NilValue); R_RegisterCFinalizerEx(ptr_sexp, Finalize, Rboolean::FALSE); return ptr_sexp; } @@ -51,7 +51,7 @@ namespace ValueConversion { template <> SEXP ToR(const char* val) { - return Rf_ScalarString(mkChar(val)); + return Rf_ScalarString(Rf_mkChar(val)); } template <> @@ -100,12 +100,12 @@ namespace ValueConversion { template <> SEXP ToR(duckdb_state val) { - return ScalarInteger(val); + return Rf_ScalarInteger(val); } template <> SEXP ToR(duckdb_type val) { - return ScalarInteger(val); + return Rf_ScalarInteger(val); }