add missing usage of "/" in normalizePath

RcppCore · Apr 15, 2016 · 52a8ad0 · 52a8ad0
1 parent e328410
commit 52a8ad0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,8 @@
-2013-05-24  J.J. Allaire <jj@rstudio.org>
+2013-05-15  Kevin Ushey <kevinushey@gmail.com>
+
+        * src/attributes.cpp: Add a missing 'winslash = "/"'
+
+2013-05-14  J.J. Allaire <jj@rstudio.org>
 
         * src/attributes.cpp: Correct handling of dependent file paths on Windows (use winslash = "/")
 

diff --git a/src/attributes.cpp b/src/attributes.cpp
@@ -894,7 +894,7 @@ namespace attributes {
             // normalize source file
             Rcpp::Environment baseEnv = Rcpp::Environment::base_env();
             Rcpp::Function normalizePath = baseEnv["normalizePath"];
-            sourceFile = Rcpp::as<std::string>(normalizePath(sourceFile));
+            sourceFile = Rcpp::as<std::string>(normalizePath(sourceFile, "/"));
 
             // parse dependencies
             std::vector<FileInfo> dependencies;