github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 12:28:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed string conversions

Browse Source
This commit is contained in:
Ian Bell
2015-02-23 22:41:20 -07:00
parent 280e9afc78
commit 518502145d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/CoolPropTools.h
View File

@@ -116,7 +116,8 @@
}
/// Get the size of a directory in bytes; from http://stackoverflow.com/a/17827724/1360263
inline unsigned long long CalculateDirSize(const std::string &path){
return CalculateDirSize(std::wstring(path.begin(), path.end()));
std::wstring wpath(path.begin(), path.end());
return CalculateDirSize(wpath);
}
inline unsigned long long CalculateDirSize(const std::wstring &path, std::vector<std::wstring> *errVect = NULL, unsigned long long size = 0)
{

3
src/CoolPropTools.cpp
View File

@@ -23,7 +23,8 @@ int ftw_function(const char *fpath, const struct stat *sb, int tflag, struct FTW
return 0; /* To tell nftw() to continue */
}
unsigned long long CalculateDirSize(const std::wstring &path){
return CalculateDirSize(std::string(path.begin(), path.end()))
std::string path(path.begin(), path.end());
return CalculateDirSize(path);
}
unsigned long long CalculateDirSize(const std::string &path){
ftw_summer = 0;