[Libreoffice-commits] core.git: include/rtl

[Stephan Bergmann]

 include/rtl/ustring.hxx |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit e559c0c9cbfd819f22ef695a9823bb71f4385b58
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 31 13:37:17 2016 +0100

    Revert "Prevent nonsensical comparations between OUString and nullptr_t"
    
    This reverts commit 2e3f5c8dd3b21efe83269f603e26ac20f3adde64, some GCC
    have trouble with deleted friend functions; need to fix that properly.

diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 5880a98..5c09765 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -1588,17 +1588,6 @@ public:
     friend bool     operator != ( const sal_Unicode * pStr1,    const OUString& rStr2 )
                         { return !(operator == ( pStr1, rStr2 )); }
 
-#if defined LIBO_INTERNAL_ONLY
-    // Prevent the above overloads from being selected for nonsensical code like
-    //
-    //   if (ouIdAttr == nullptr)
-    //
-    friend bool operator ==(OUString const &, std::nullptr_t) = delete;
-    friend bool operator ==(std::nullptr_t, OUString const &) = delete;
-    friend bool operator !=(OUString const &, std::nullptr_t) = delete;
-    friend bool operator !=(std::nullptr_t, OUString const &) = delete;
-#endif
-
     friend bool     operator <  ( const OUString& rStr1,    const OUString& rStr2 )
                         { return rStr1.compareTo( rStr2 ) < 0; }
     friend bool     operator >  ( const OUString& rStr1,    const OUString& rStr2 )