[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann]

 connectivity/source/commontools/TDatabaseMetaDataBase.cxx |   26 +++++++-------
 connectivity/source/inc/TDatabaseMetaDataBase.hxx         |    2 -
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit bf720502e1ec1509053dc5998cd322e6d0cae234
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 5 10:39:43 2017 +0100

    Replace deprecated std::mem_fun et al in connectivity
    
    (as std::mem_fun_t is gone by default at least from recent libc++ in C++17 mode)
    
    Change-Id: I74a7ff92385068cb4de1865921bd7c2509859b63
    Reviewed-on: https://gerrit.libreoffice.org/45859
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 18ac991a0024..d66e6c918db4 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -258,67 +258,67 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs(  )
 
 OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString(  )
 {
-    return callImplMethod(m_sIdentifierQuoteString,std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
+    return callImplMethod(m_sIdentifierQuoteString,std::function<OUString(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart(  )
 {
-    return callImplMethod(m_isCatalogAtStart,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
+    return callImplMethod(m_isCatalogAtStart,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
 }
 
 OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator(  )
 {
-    return callImplMethod(m_sCatalogSeparator,std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
+    return callImplMethod(m_sCatalogSeparator,std::function<OUString(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions(  )
 {
-    return callImplMethod(m_supportsCatalogsInTableDefinitions,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
+    return callImplMethod(m_supportsCatalogsInTableDefinitions,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions(  )
 {
-    return callImplMethod(m_supportsSchemasInTableDefinitions,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
+    return callImplMethod(m_supportsSchemasInTableDefinitions,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation(  )
 {
-    return callImplMethod(m_supportsCatalogsInDataManipulation,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
+    return callImplMethod(m_supportsCatalogsInDataManipulation,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation(  )
 {
-    return callImplMethod(m_supportsSchemasInDataManipulation,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
+    return callImplMethod(m_supportsSchemasInDataManipulation,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers(  )
 {
-    return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
+    return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn(  )
 {
-    return callImplMethod(m_supportsAlterTableWithAddColumn,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
+    return callImplMethod(m_supportsAlterTableWithAddColumn,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn(  )
 {
-    return callImplMethod(m_supportsAlterTableWithDropColumn,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
+    return callImplMethod(m_supportsAlterTableWithDropColumn,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements(  )
 {
-    return callImplMethod(m_MaxStatements,std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
+    return callImplMethod(m_MaxStatements,std::function<sal_Int32(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect(  )
 {
-    return callImplMethod(m_MaxTablesInSelect,std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
+    return callImplMethod(m_MaxTablesInSelect,std::function<sal_Int32(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers(  )
 {
-    return callImplMethod(m_storesMixedCaseQuotedIdentifiers,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
+    return callImplMethod(m_storesMixedCaseQuotedIdentifiers,std::function<bool(ODatabaseMetaDataBase *)>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
 }
 
 
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index b8841927addc..a13adf215167 100644
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
@@ -54,7 +54,7 @@ namespace connectivity
             std::pair<bool,sal_Int32>         m_MaxTablesInSelect;
             std::pair<bool,bool>              m_storesMixedCaseQuotedIdentifiers;
 
-            template <typename T> T callImplMethod(std::pair<bool,T>& _rCache,const std::mem_fun_t<T,ODatabaseMetaDataBase>& _pImplMethod)
+            template <typename T> T callImplMethod(std::pair<bool,T>& _rCache,const std::function<T(ODatabaseMetaDataBase *)>& _pImplMethod)
             {
                 ::osl::MutexGuard aGuard( m_aMutex );
                 if ( !_rCache.first )