Merge remote-tracking branch 'origin/master' into feature_slice_to_png

This commit is contained in:
tamasmeszaros 2018-05-23 16:29:02 +02:00
commit 56db426de7
15 changed files with 7984 additions and 4804 deletions

View file

@ -95,7 +95,7 @@ const std::string& var_dir()
std::string var(const std::string &file_name)
{
auto file = boost::filesystem::canonical(boost::filesystem::path(g_var_dir) / file_name).make_preferred();
auto file = (boost::filesystem::path(g_var_dir) / file_name).make_preferred();
return file.string();
}