more care in wrap( const char*)

romainfrancois · romainfrancois · commit 52504d6230da · 2013-11-14T11:44:37.000+01:00
diff --git a/inst/include/Rcpp/internal/wrap.h b/inst/include/Rcpp/internal/wrap.h
@@ -921,7 +921,10 @@ inline SEXP module_wrap<SEXP>( const SEXP& obj ){
 }
 
 inline SEXP wrap(const char* const v ){ 
-	return Rf_mkString(v) ;
+	if (v != NULL)
+		return Rf_mkString(v) ;
+	else 	
+		return R_NilValue;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -921,7 +921,10 @@ inline SEXP module_wrap<SEXP>( const SEXP& obj ){`
`921`	`921`	`}`
`922`	`922`
`923`	`923`	`inline SEXP wrap(const char* const v ){`
`924`		`- return Rf_mkString(v) ;`
	`924`	`+ if (v != NULL)`
	`925`	`+ return Rf_mkString(v) ;`
	`926`	`+ else`
	`927`	`+ return R_NilValue;`
`925`	`928`	`}`
`926`	`929`
`927`	`930`	`/**`