diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-12 18:07:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-12 18:14:37 +0200 |
| commit | f20162304d73bc01955e9ef6506c3bd1c7016c48 (patch) | |
| tree | 02db77ed152f635bbd5a22ab064e74c79c6c359c | |
| parent | 7cedeaeba79bdd54b3bcbadb21c51cc535cf4a5d (diff) | |
Rule out OString(std::nullptr_t)
(This is no issue for OUString, as it has two ctors taking a single pointer
argument, so passing a null pointer is ambiguous anyway.)
Change-Id: I36f44b29eb84eb83e284fa080d706eabb4b485d5
| -rw-r--r-- | include/rtl/string.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index 1aeecc0ca0a2..995fe7e39c80 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -23,6 +23,7 @@ #include <sal/config.h> #include <cassert> +#include <cstddef> #include <new> #include <ostream> #include <string.h> @@ -256,6 +257,10 @@ public: } #endif +#ifdef LIBO_INTERNAL_ONLY + OString(std::nullptr_t) = delete; +#endif + /** Release the string data. */ |