Rf_

krlmlr · Jun 26, 2024 · f9ad0a7 · f9ad0a7
1 parent fb9b04c
commit f9ad0a7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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);
 	}