diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-12-16 20:28:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-16 20:52:39 +0000 |
| commit | 66397a4fd222757a8bd651c0c297615319eac4a5 (patch) | |
| tree | f84d3cc35ccf23bdcf148cc86835bbb9932350e6 /include/o3tl | |
| parent | b1d65c9f1535c9ef283d2a91a225359e5983f747 (diff) | |
fdo#72598 Remove SunStudio cruft from code base
Change-Id: I5150eec33228e18e274a8ae4effd3f185851b7f4
Reviewed-on: https://gerrit.libreoffice.org/7103
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/o3tl')
| -rw-r--r-- | include/o3tl/heap_ptr.hxx | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/o3tl/heap_ptr.hxx b/include/o3tl/heap_ptr.hxx index 713aa21c41b8..d094c253f744 100644 --- a/include/o3tl/heap_ptr.hxx +++ b/include/o3tl/heap_ptr.hxx @@ -78,9 +78,7 @@ class heap_ptr typedef T element_type; /// Provided for generic programming. typedef heap_ptr<T> self; -#ifndef __SUNPRO_CC typedef T * (self::* safe_bool )(); -#endif /// Now, pass_heapObject is owned by this. explicit heap_ptr( @@ -98,13 +96,7 @@ class heap_ptr const T * operator->() const; T * operator->(); - /// True, if pHeapObject != 0. -#ifndef __SUNPRO_CC operator safe_bool() const; -#else // workaround opt bug of Sun C++ compiler, when compiling with -xO3 - operator bool() const; -#endif - /** This deletes any prevoiusly existing ->pHeapObject. Now, pass_heapObject, if != 0, is owned by this. @@ -224,8 +216,6 @@ heap_ptr<T>::operator->() return pHeapObject; } -#ifndef __SUNPRO_CC - template <class T> inline heap_ptr<T>::operator typename heap_ptr<T>::safe_bool() const @@ -235,18 +225,6 @@ heap_ptr<T>::operator typename heap_ptr<T>::safe_bool() const : safe_bool(0); } -#else - -template <class T> -inline heap_ptr<T>::operator bool() const -{ - return is(); -} - -#endif // !defined(__SUNPRO_CC) - - - template <class T> void heap_ptr<T>::reset(T * pass_heapObject) |