diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-31 13:37:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-31 13:37:17 +0100 |
| commit | e559c0c9cbfd819f22ef695a9823bb71f4385b58 (patch) | |
| tree | 1b864bf96e10ba17326011026ce5851329e03fe9 /include/rtl/ustring.hxx | |
| parent | 2e3f5c8dd3b21efe83269f603e26ac20f3adde64 (diff) | |
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.
Diffstat (limited to 'include/rtl/ustring.hxx')
| -rw-r--r-- | include/rtl/ustring.hxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index 5880a98dfb7f..5c097656c917 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 ) |