diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-25 10:15:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-25 12:38:32 +0200 |
| commit | 8007417c318140d74b87ec5abcf835f4a2ba9682 (patch) | |
| tree | 0ea40500853d78008c0d1aa1083a0e415e457e9a /include/rtl/stringconcat.hxx | |
| parent | Just continue to next iteration (diff) | |
| download | core-8007417c318140d74b87ec5abcf835f4a2ba9682.tar.gz core-8007417c318140d74b87ec5abcf835f4a2ba9682.zip | |
Revert "Revert "Generalize OUStringLiteral1""
This reverts commit 5cba714b4d03ed54debf71534ad8c8edc383a01e, now including a
workaround for <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53658> "internal
compiler error -- segmentation fault."
Change-Id: I31f6d9ddcb0b884134703df2b9dc1800ba0a84be
Diffstat (limited to 'include/rtl/stringconcat.hxx')
| -rw-r--r-- | include/rtl/stringconcat.hxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx index a74dd77ad78c..7ef9e1104094 100644 --- a/include/rtl/stringconcat.hxx +++ b/include/rtl/stringconcat.hxx @@ -141,6 +141,19 @@ struct ToStringHelper< const char[ N ] > static const bool allowOUStringConcat = true; }; +#if defined LIBO_INTERNAL_ONLY +template<char C> struct ToStringHelper<OUStringLiteral1_<C>> { + static int length(OUStringLiteral1_<C>) { return 1; } + static char * addData(char * buffer, OUStringLiteral1_<C> literal) + { return addDataHelper(buffer, &literal.c, 1); } + static sal_Unicode * addData( + sal_Unicode * buffer, OUStringLiteral1_<C> literal) + { return addDataLiteral(buffer, &literal.c, 1); } + static bool const allowOStringConcat = false; + static bool const allowOUStringConcat = true; +}; +#endif + /** @internal |