Merge branch 'hotfix-1.2' into prepare-utf8

This commit is contained in:
Jinhao
2015-12-04 23:44:11 +08:00
28 changed files with 351 additions and 236 deletions

View File

@@ -95,13 +95,13 @@ namespace nana
std::string pos_str() const
{
#ifdef NANA_MINGW
#ifdef UNDEFINED_to_string
std::stringstream ss;
ss<<pos();
return ss.str();
#else
return std::to_string(pos());
#endif // NANA_MINGW
#endif // UNDEFINED_to_string
}
token read()