generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-12 18:20:26 +01:00
Code Issues Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Günter Obiltschnig 2018-02-14 09:56:30 +01:00
parent 14172912bd
commit 4ea0372a4f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Foundation/src/Path_WIN32U.cpp
View File

@ -132,14 +132,12 @@ std::string PathImpl::cacheHomeImpl()
}
<<<<<<< HEAD
=======
std::string PathImpl::tempHomeImpl()
{
return tempImpl();
}
>>>>>>> 06e59cb... add Windows compliant implementation of XDG Base Directory Specification
std::string PathImpl::tempImpl()
{
Buffer<wchar_t> buffer(MAX_PATH_LEN);