diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-10-05 06:19:56 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-10-05 16:02:52 +0200 |
| commit | 1944e3ddc0b2247de3138d2a441cd6999e21fd9a (patch) | |
| tree | b59f213e245e151ee792ca424fd06b5a11c88857 /include/sal | |
| parent | 81d404803f477eb71b74eb9c7a67bba6b1af95d1 (diff) | |
Rename and move SAL_U/W to o3tl::toU/W
Previosly (since commit 9ac98e6e3488e434bf4864ecfb13a121784f640b)
it was expected to gradually remove SAL_U/W usage in Windows code
by replacing with reinterpret_cast or changing to some bettertypes.
But as it's useful to make use of fact that LibreOffice and Windows
use compatible representation of strings, this commit puts these
functions to a better-suited o3tl, and recommends that the functions
be consistently used throughout Windows-specific code to reflect the
compatibility and keep the casts safe.
Change-Id: I2f7c65606d0e2d0c01a00f08812bb4ab7659c5f6
Reviewed-on: https://gerrit.libreoffice.org/43150
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/sal')
| -rw-r--r-- | include/sal/types.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/sal/types.h b/include/sal/types.h index a138a90858df..14c8e90d293d 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -682,21 +682,6 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { /// @endcond -#if defined LIBO_INTERNAL_ONLY && defined __cplusplus && defined SAL_W32 -/// @cond INTERNAL -// Temporary scaffolding for the MSVC sal_Unicode wchar_t -> char16_t change; to -// be removed again: -inline wchar_t * SAL_W(char16_t * p) -{ return reinterpret_cast<wchar_t *>(p); } -inline wchar_t const * SAL_W(char16_t const * p) -{ return reinterpret_cast<wchar_t const *>(p); } -inline char16_t * SAL_U(wchar_t * p) -{ return reinterpret_cast<char16_t *>(p); } -inline char16_t const * SAL_U(wchar_t const * p) -{ return reinterpret_cast<char16_t const *>(p); } -/// @endcond -#endif - /// @cond INTERNAL /** Annotate pointer-returning functions to indicate that such a pointer is never nullptr. |