diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-12-20 00:43:38 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-12-20 06:40:18 +0000 |
| commit | 72434f7ff1b815240de5a37180ce1beff0bf7f34 (patch) | |
| tree | 707e4d20b9e4b8f552efc22f1aad474b2b694b02 /include/rtl | |
| parent | 3612634fee539c7ee4163ac553691f8d64291244 (diff) | |
sal: make OString/OUString immovable for MSVC
Odd problem, with MSVC 2013 in CppunitTest_smoketest in
sal/osl/w32/procimpl.cxx the read_environment calls std::stable_sort,
which turns about 89 elements into the empty string since commit
c9f6e12e7eb6a49389360626d206191147a174fb.
No idea what the problem is but let's disable the move for now.
Change-Id: I2912cd54a339bb6ab39922be516ea368a430f7c9
Reviewed-on: https://gerrit.libreoffice.org/20834
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/rtl')
| -rw-r--r-- | include/rtl/string.hxx | 4 | ||||
| -rw-r--r-- | include/rtl/ustring.hxx | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index 57784885e773..5507e973b1f2 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -114,6 +114,7 @@ public: rtl_string_acquire( pData ); } +#ifndef _MSC_VER // TODO? #if defined LIBO_INTERNAL_ONLY /** Move constructor. @@ -128,6 +129,7 @@ public: rtl_string_new( &str.pData ); } #endif +#endif /** New string from OString data. @@ -296,6 +298,7 @@ public: return *this; } +#ifndef _MSC_VER // TODO? #if defined LIBO_INTERNAL_ONLY /** Move assign a new string. @@ -312,6 +315,7 @@ public: return *this; } #endif +#endif /** @overload diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index 3ede5973d016..6df22279d65b 100644 --- a/include/rtl/ustring.hxx +++ b/include/rtl/ustring.hxx @@ -130,6 +130,7 @@ public: rtl_uString_acquire( pData ); } +#ifndef _MSC_VER // TODO? #if defined LIBO_INTERNAL_ONLY /** Move constructor. @@ -144,6 +145,7 @@ public: rtl_uString_new( &str.pData ); } #endif +#endif /** New string from OUString data. @@ -401,6 +403,7 @@ public: return *this; } +#ifndef _MSC_VER // TODO? #if defined LIBO_INTERNAL_ONLY /** Move assign a new string. @@ -417,6 +420,7 @@ public: return *this; } #endif +#endif /** Assign a new string from an 8-Bit string literal that is expected to contain only |