include/rtl/string.hxx | 4 ++++ include/rtl/ustring.hxx | 4 ++++ 2 files changed, 8 insertions(+)
New commits: commit 72434f7ff1b815240de5a37180ce1beff0bf7f34 Author: Michael Stahl <[email protected]> Date: Sun Dec 20 00:43:38 2015 +0100 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 <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index 5778488..5507e97 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 3ede597..6df2227 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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
