connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 2 ++
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit e884223505535d497bb5c7cd96dd17daaf4c415c
Author: Tamas Bunth <tamas.bu...@collabora.co.uk>
AuthorDate: Thu Apr 25 12:17:06 2019 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Apr 25 15:46:25 2019 +0200
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.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index 10cc65122dfa..cc9348860d7a 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -199,6 +199,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
@@ -257,6 +258,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 e89345ba0196..048d7a44217c 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
SAL_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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
