wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

weird ubuntu std::string bug work-around

This commit is contained in:
Arvid Norberg 2010-03-07 21:59:02 +00:00
parent dcffa55700
commit d73cf769f1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/file.cpp
View File

@ -444,12 +444,18 @@ namespace libtorrent
if (rhs.empty()) return lhs; if (rhs.empty()) return lhs;
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
#define TORRENT_SEPARATOR "\\"
bool need_sep = lhs[lhs.size()-1] != '\\' && lhs[lhs.size()-1] != '/'; bool need_sep = lhs[lhs.size()-1] != '\\' && lhs[lhs.size()-1] != '/';
return lhs + (need_sep?"\\":"") + rhs;
#else #else
#define TORRENT_SEPARATOR "/"
bool need_sep = lhs[lhs.size()-1] != '/'; bool need_sep = lhs[lhs.size()-1] != '/';
return lhs + (need_sep?"/":"") + rhs;
#endif #endif
std::string ret;
int target_size = lhs.size() + rhs.size() + 2;
ret.resize(target_size);
snprintf(&ret[0], target_size, "%s%s%s", lhs.c_str()
, (need_sep?TORRENT_SEPARATOR:""), rhs.c_str());
return ret;
} }
std::string current_working_directory() std::string current_working_directory()