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 /connectivity/source/inc/file | |
| 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 'connectivity/source/inc/file')
| -rw-r--r-- | connectivity/source/inc/file/fanalyzer.hxx | 8 | ||||
| -rw-r--r-- | connectivity/source/inc/file/fcode.hxx | 10 | ||||
| -rw-r--r-- | connectivity/source/inc/file/fcomp.hxx | 8 |
3 files changed, 0 insertions, 26 deletions
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index ea33b682a8e7..bf0bf810299d 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -45,14 +45,6 @@ namespace connectivity public: OSQLAnalyzer(OConnection* _pConnection); ~OSQLAnalyzer(); - static void * operator new( size_t nSize ) - { return ::rtl_allocateMemory( nSize ); } - static void * operator new( size_t /*nSize*/,void* _pHint ) - { return _pHint; } - static void operator delete( void * pMem ) - { ::rtl_freeMemory( pMem ); } - static void operator delete( void * /*pMem*/,void* /*_pHint*/ ) - { } OConnection* getConnection() const { return m_pConnection; } void bindEvaluationRow(OValueRefRow const & _pRow); // Bind an evaluation row to the restriction diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index d83ede26aed0..da0670f4e1da 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -52,16 +52,6 @@ namespace connectivity //and same issue for the assignment operators OCode& operator=(const OCode&) = default; OCode& operator=(OCode&&) = default; - - static void * operator new( size_t nSize ) - { return ::rtl_allocateMemory( nSize ); } - static void * operator new( size_t /*nSize*/,void* _pHint ) - { return _pHint; } - static void operator delete( void * pMem ) - { ::rtl_freeMemory( pMem ); } - static void operator delete( void * /*pMem*/,void* /*_pHint*/ ) - { } - }; diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index 1485060873a1..bc1b452e1915 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -48,14 +48,6 @@ namespace connectivity virtual ~OPredicateCompiler() override; - static void * operator new( size_t nSize ) - { return ::rtl_allocateMemory( nSize ); } - static void * operator new( size_t /*nSize*/,void* _pHint ) - { return _pHint; } - static void operator delete( void * pMem ) - { ::rtl_freeMemory( pMem ); } - static void operator delete( void * /*pMem*/,void* /*_pHint*/ ) - { } void dispose(); void start(connectivity::OSQLParseNode const * pSQLParseNode); |