mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jinhao 2015-09-27 16:46:07 +08:00
commit 75ee238f34
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -33,3 +33,7 @@ _ReSharper*/
*.suo *.suo
*.sdf *.sdf
lib/ lib/
*.ninja*
CMakeCache.txt
CMakeFiles/
cmake_install.cmake

4
CMakeLists.txt
View File

@ -65,7 +65,11 @@ if(WIN32)
if(MINGW) if(MINGW)
add_definitions(-DNANA_MINGW) add_definitions(-DNANA_MINGW)
add_definitions(-DSTD_CODECVT_NOT_SUPPORTED) add_definitions(-DSTD_CODECVT_NOT_SUPPORTED)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8.1")
option(NANA_THREAD_NOT_SUPPORTED "Use this flag if MinGW version is older than 4.8.1" ON) option(NANA_THREAD_NOT_SUPPORTED "Use this flag if MinGW version is older than 4.8.1" ON)
endif()
endif()
if(NANA_THREAD_NOT_SUPPORTED) if(NANA_THREAD_NOT_SUPPORTED)
add_definitions(-DSTD_THREAD_NOT_SUPPORTED) add_definitions(-DSTD_THREAD_NOT_SUPPORTED)
endif() endif()

3
source/filesystem/filesystem.cpp
View File

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