diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-16 16:54:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-17 09:09:33 +0200 |
| commit | 9a831a6c19a30869782cfeb17f1c649a4ce4d9d9 (patch) | |
| tree | 690a29bf99b90c18b2b7f8ce7829a9b932a2f0fc /include/connectivity | |
| parent | b3f094c2573de12bf3d386f19b924b536cb89af0 (diff) | |
remove no longer necessary operator new/delete overrides
and use "using" statements for the places where the overrides were
resolving ambiguities
Change-Id: Icb1d1a41f19e00f28a19947aa2c40bd5778fff94
Reviewed-on: https://gerrit.libreoffice.org/52993
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/connectivity')
| -rw-r--r-- | include/connectivity/FValue.hxx | 9 | ||||
| -rw-r--r-- | include/connectivity/sqliterator.hxx | 9 | ||||
| -rw-r--r-- | include/connectivity/sqlscan.hxx | 9 |
3 files changed, 0 insertions, 27 deletions
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 65302f814c72..86a94273d352 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -278,15 +278,6 @@ namespace connectivity free(); } - static void * operator new( size_t nSize ) - { return ::rtl_allocateMemory( nSize ); } - static void * operator new( size_t,void* _pHint ) - { return _pHint; } - static void operator delete( void * pMem ) - { ::rtl_freeMemory( pMem ); } - static void operator delete( void *,void* ) - { } - ORowSetValue& operator=(const ORowSetValue& _rRH); ORowSetValue& operator=(ORowSetValue&& _rRH); diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index 2dad97b64ab2..d10bc71ea81d 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -158,15 +158,6 @@ namespace connectivity const OSQLParser& _rParser ); ~OSQLParseTreeIterator(); - static void * operator new( size_t nSize ) - { return ::rtl_allocateMemory( nSize ); } - static void * operator new( size_t,void* _pHint ) - { return _pHint; } - static void operator delete( void * pMem ) - { ::rtl_freeMemory( pMem ); } - static void operator delete( void *,void* ) - { } - void dispose(); bool isCaseSensitive() const; // The parse tree to be analysed/traversed: diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index 12addf24a2be..de0f0faff8f1 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -44,15 +44,6 @@ namespace connectivity OSQLScanner(); virtual ~OSQLScanner(); - static void * operator new( size_t nSize ) - { return ::rtl_allocateMemory( nSize ); } - static void * operator new( size_t,void* _pHint ) - { return _pHint; } - static void operator delete( void * pMem ) - { ::rtl_freeMemory( pMem ); } - static void operator delete( void *,void* ) - { } - sal_Int32 SQLyygetc(); void SQLyyerror(char const *fmt); IParseContext::InternationalKeyCode getInternationalTokenID(const char* sToken) const; |