diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-01-17 18:35:37 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-21 07:36:04 +0100 |
| commit | 979aed6b38f4963ea37c39de090d4487a12ba2ba (patch) | |
| tree | a5cf6cfe464f00f8654140a514e0f418210b6f69 /desktop/win32 | |
| parent | 3b16e997f69efe2e3f6cdf64fe8fb2727b6ebaa7 (diff) | |
o3tl::make_unique -> std::make_unique in dbaccess...framework
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Iad5a422bc5a7da43d905edc91d1c46793332ec5e
Reviewed-on: https://gerrit.libreoffice.org/66545
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop/win32')
| -rw-r--r-- | desktop/win32/source/guistdio/guistdio.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc index ea466769d517..85822a817d63 100644 --- a/desktop/win32/source/guistdio/guistdio.inc +++ b/desktop/win32/source/guistdio/guistdio.inc @@ -26,7 +26,8 @@ #include <stdio.h> #include <sal/macros.h> -#include <o3tl/make_unique.hxx> + +#include <memory> #ifdef UNOPKG @@ -161,7 +162,7 @@ DWORD WINAPI InputThread( LPVOID pParam ) //can be used (little and big endian); int cNewLine = WideCharToMultiByte( GetConsoleCP(), 0, L"\r\n", 2, nullptr, 0, nullptr, nullptr); - auto mbBuff = o3tl::make_unique<char[]>(cNewLine); + auto mbBuff = std::make_unique<char[]>(cNewLine); WideCharToMultiByte( GetConsoleCP(), 0, L"\r\n", 2, mbBuff.get(), cNewLine, nullptr, nullptr); @@ -208,7 +209,7 @@ DWORD WINAPI InputThread( LPVOID pParam ) int sizeWBuf = MultiByteToWideChar( GetConsoleCP(), MB_PRECOMPOSED, readBuf, readAll, nullptr, 0); - auto wideBuf = o3tl::make_unique<wchar_t[]>(sizeWBuf); + auto wideBuf = std::make_unique<wchar_t[]>(sizeWBuf); //Do the conversion. MultiByteToWideChar( |