summaryrefslogtreecommitdiff
path: root/include/rtl/ustring.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/rtl/ustring.hxx')
-rw-r--r--include/rtl/ustring.hxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index cd23f121e2ac..cad8cc10ac48 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -96,10 +96,7 @@ public:
OUStringLiteral(char16_t const (&literal)[N]) {
assertLayout();
assert(literal[N - 1] == '\0');
- //TODO: Use C++20 constexpr std::copy_n (P0202R3):
- for (std::size_t i = 0; i != N; ++i) {
- more.buffer[i] = literal[i];
- }
+ std::copy_n(literal, N, more.buffer);
}
constexpr sal_Int32 getLength() const { return more.length; }
@@ -123,7 +120,7 @@ private:
oslInterlockedCount refCount = 0x40000000; // SAL_STRING_STATIC_FLAG (sal/rtl/strimp.hxx)
sal_Int32 length = N - 1;
- sal_Unicode buffer[N] = {}; //TODO: drop initialization for C++20 (P1331R2)
+ sal_Unicode buffer[N];
};
public: