diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-17 09:26:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-17 14:11:12 +0200 |
| commit | dd6db74abddfe27671c2593eefefa871466b02f5 (patch) | |
| tree | 8d7c9f5d34d1faefec4ff550add51a263b1c4fd6 /connectivity | |
| parent | 28beaffba6a0ecaf351c84bed41443a6721d85b6 (diff) | |
inline some use-once typedefs
Change-Id: I683175c1e788a2a4cfec9504dc8dc3ebfee7c5de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100858
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/postgresql/pq_connection.cxx | 7 | ||||
| -rw-r--r-- | connectivity/source/inc/hsqldb/HConnection.hxx | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index b0521d0a83a7..43ce0bc6ba2b 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -133,14 +133,11 @@ Connection::~Connection() m_settings.pConnection = nullptr; } } -typedef std::vector< css::uno::Reference< css::sdbc::XCloseable > > CloseableVector; - -typedef std::vector< css::uno::Reference< css::lang::XComponent > > DisposeableVector; void Connection::close() { - CloseableVector vectorCloseable; - DisposeableVector vectorDispose; + std::vector< css::uno::Reference< css::sdbc::XCloseable > > vectorCloseable; + std::vector< css::uno::Reference< css::lang::XComponent > > vectorDispose; { MutexGuard guard( m_xMutex->GetMutex() ); // silently ignore, if the connection has been closed already diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 93efe9dfb9d2..78bcfe26eaf1 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -130,12 +130,9 @@ namespace connectivity::hsqldb class MethodGuard : public ::osl::MutexGuard { - private: - typedef ::osl::MutexGuard BaseGuard; - public: MethodGuard( const IMethodGuardAccess& _rComponent ) - :BaseGuard( _rComponent.getMutex() ) + : ::osl::MutexGuard( _rComponent.getMutex() ) { _rComponent.checkDisposed(); } |