From f6262b3dcb4126ea03802e66ddf5bfa8833e6328 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 7 Mar 2017 08:12:52 +0100 Subject: Remove redundant 'inline' keyword, Linux redux Change-Id: I10c7dbd6a7acce309b056a1ae57c39f00f22c46d --- mysqlc/source/mysqlc_connection.hxx | 4 ++-- mysqlc/source/mysqlc_databasemetadata.hxx | 2 +- mysqlc/source/mysqlc_resultsetmetadata.hxx | 2 +- mysqlc/source/mysqlc_services.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mysqlc/source') diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 4d2d74f22f37..19f836c9bfcd 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -184,10 +184,10 @@ namespace connectivity // TODO: Not used //sal_Int32 sdbcColumnType(rtl::OUString typeName); - inline const ConnectionSettings& getConnectionSettings() const { return m_settings; } + const ConnectionSettings& getConnectionSettings() const { return m_settings; } rtl::OUString transFormPreparedStatement(const rtl::OUString& _sSQL); - inline const MysqlCDriver& getDriver() const { return m_rDriver;} + const MysqlCDriver& getDriver() const { return m_rDriver;} }; /* OConnection */ // TODO: Not used. diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index f32a06107268..b8011763c5a4 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -57,7 +57,7 @@ namespace connectivity bool impl_getRSTypeMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)(int), sal_Int32 _resultSetType ); public: - inline const OConnection& getOwnConnection() const { return m_rConnection; } + const OConnection& getOwnConnection() const { return m_rConnection; } explicit ODatabaseMetaData(OConnection& _rCon); virtual ~ODatabaseMetaData(); diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index a160208471db..4a5282643b32 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -51,7 +51,7 @@ namespace connectivity { } - inline rtl::OUString convert( const ::std::string& _string ) const + rtl::OUString convert( const ::std::string& _string ) const { return rtl::OUString( _string.c_str(), _string.size(), m_encoding ); } diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx index aaa4099ae9ec..81b0aa2f7246 100644 --- a/mysqlc/source/mysqlc_services.cxx +++ b/mysqlc/source/mysqlc_services.cxx @@ -53,7 +53,7 @@ struct ProviderRequest { } - inline bool CREATE_PROVIDER( + bool CREATE_PROVIDER( const rtl::OUString& Implname, const Sequence< rtl::OUString > & Services, ::cppu::ComponentInstantiation Factory, -- cgit