diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-20 12:00:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-20 12:14:46 +0100 |
| commit | 46ce4f561dafeaab614e83653cba646885e8fd17 (patch) | |
| tree | 7b1ccc412182a8521418a5ae12f0f961aca0cfd6 /sal | |
| parent | ce2147ec43c8116c801e9a83f81eea188c2a719e (diff) | |
Code clean up.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/cpprt/operators_new_delete.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sal/cpprt/operators_new_delete.cxx b/sal/cpprt/operators_new_delete.cxx index e07d2ec57c7f..9561a893293f 100644 --- a/sal/cpprt/operators_new_delete.cxx +++ b/sal/cpprt/operators_new_delete.cxx @@ -49,8 +49,6 @@ #include <osl/diagnose.h> #include <rtl/alloc.h> -using std::nothrow_t; - // ======================================================================= // AllocatorTraits // ======================================================================= @@ -158,8 +156,8 @@ static void* allocate ( // ======================================================================= -static void* allocate ( - std::size_t n, AllocatorTraits const & rTraits, std::nothrow_t const &) +static void* allocate_nothrow ( + std::size_t n, AllocatorTraits const & rTraits) SAL_THROW(()) { try @@ -205,7 +203,7 @@ void SAL_CALL operator delete (void * p) throw () void* SAL_CALL operator new (std::size_t n, std::nothrow_t const &) throw () { - return allocate (n, ScalarTraits(), nothrow_t()); + return allocate_nothrow (n, ScalarTraits()); } // ======================================================================= @@ -237,7 +235,7 @@ void SAL_CALL operator delete[] (void * p) throw () void* SAL_CALL operator new[] (std::size_t n, std::nothrow_t const &) throw () { - return allocate (n, VectorTraits(), nothrow_t()); + return allocate_nothrow (n, VectorTraits()); } // ======================================================================= |