Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2016-11-12 18:06:26 +01:00
58 changed files with 6498 additions and 735 deletions

View File

@@ -1086,7 +1086,7 @@ std::vector<std::string> split(const std::string &s, char delim)
return vec;
}
#if __cplusplus <= 201103L
#if __cplusplus < 201103L
std::string to_string(int i)
{
std::stringstream s;