Merge branch 'master' of https://github.com/htzh/nana into htzh-master

This commit is contained in:
Jinhao
2015-09-27 16:46:07 +08:00
3 changed files with 10 additions and 3 deletions

View File

@@ -430,8 +430,7 @@ namespace nana {
delete[] p;
return s;
}
nana::string s = buf;
return s;
return nana::string(buf);
}
#elif defined(NANA_LINUX)
const char * s = ::getenv("PWD");