Explicit enc2native()

tidyverse · May 4, 2018 · 8a8c061 · 8a8c061
1 parent 945178d
commit 8a8c061
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/XlsWorkBook.h b/src/XlsWorkBook.h
@@ -9,7 +9,8 @@
 inline std::string normalizePath(std::string path) {
   Rcpp::Environment baseEnv = Rcpp::Environment::base_env();
   Rcpp::Function normalizePath = baseEnv["normalizePath"];
-  return Rcpp::as<std::string>(normalizePath(path, "/", true));
+  Rcpp::Function enc2native = baseEnv["enc2native"];
+  return Rcpp::as<std::string>(enc2native(normalizePath(path, "/", true)));
 }
 
 class XlsWorkBook {
@@ -26,8 +27,7 @@ class XlsWorkBook {
 public:
 
   XlsWorkBook(const std::string& path) {
-    //path_ = normalizePath(path);
-    path_ = path;
+    path_ = normalizePath(path);
 
     xls::xlsWorkBook* pWB_ = xls::xls_open(path_.c_str(), "UTF-8");
     if (pWB_ == NULL) {