From f20162304d73bc01955e9ef6506c3bd1c7016c48 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sun, 12 Jul 2015 18:07:51 +0200
Subject: 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
---
 include/rtl/string.hxx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include/rtl')

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.
     */
-- 
cgit