diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2019-04-25 12:17:06 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2019-08-02 16:50:19 +0200 |
| commit | 62bd8daf20b66cea5b84b05fb04b9ed5240b1ab9 (patch) | |
| tree | 1c55e140ec02c67721bbbf661a889d2445bbd4e8 /connectivity | |
| parent | e7d3a95d9c87150bcaaf78d5a790ea44e6c1e41b (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 b3630072c143..2eaeceb66b90 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -198,6 +198,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 @@ -256,6 +257,7 @@ template <> OUString OPreparedResultSet::retrieveValue(sal_Int32 column) OUString sReturn = OUString(sStr, *m_aData[column - 1].length, m_encoding); return sReturn; } +}} 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 b43935039efe..d10c8df5dacd 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx @@ -92,8 +92,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); // you can't delete objects of this type |