diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2019-04-25 12:17:06 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-05-09 19:12:44 +0100 |
| commit | d91a2c8691f50806ec68d163edb38ccb4b011bd9 (patch) | |
| tree | a448cb6d34c2c212b68b179b0c91390f3e2c1faf /connectivity | |
| parent | d5d64ddbb7d94cb312423fe2a33b07a91139c175 (diff) | |
mysqlc: move template specialization to namespace
so gcc 4.8 would be happy about it.
See:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
Change-Id: I7e696758c5598b9e64947bc9b1606c653becddce
Reviewed-on: https://gerrit.libreoffice.org/71294
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/76732
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index 984914016a13..e39e90b1b8b4 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -255,6 +255,7 @@ template <typename T> T OPreparedResultSet::retrieveValue(sal_Int32 nColumnIndex return getRowSetValue(nColumnIndex); } +namespace connectivity { namespace mysqlc { template <> uno::Sequence<sal_Int8> OPreparedResultSet::retrieveValue(sal_Int32 column) { // TODO make conversion possible @@ -315,6 +316,7 @@ template <> OUString OPreparedResultSet::retrieveValue(sal_Int32 column) return OUString(sStr, *m_aData[column - 1].length, m_encoding); } +}} ORowSetValue OPreparedResultSet::getRowSetValue(sal_Int32 nColumnIndex) { diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx index 4ff64d5b4320..78e9e79b1d75 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx @@ -93,8 +93,8 @@ class OPreparedResultSet final : public OBase_Mutex, void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const override; - template <typename T> T safelyRetrieveValue(const sal_Int32 nColumnIndex); - template <typename T> T retrieveValue(const sal_Int32 nColumnIndex); + template <typename T> T safelyRetrieveValue(sal_Int32 nColumnIndex); + template <typename T> T retrieveValue(sal_Int32 nColumnIndex); connectivity::ORowSetValue getRowSetValue(sal_Int32 nColumnIndex); bool fetchResult(); |