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

[Stephan Bergmann]

 connectivity/source/drivers/file/FResultSet.cxx |    2 +-
 connectivity/source/drivers/mork/MResultSet.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ed5028b5065c62e9c9527ed0c2517670aa49044
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 5 10:35:52 2017 +0100

    Replace deprecated std::bin2nd with lambda in connectivity
    
    (as std::bind2nd is gone by default at least from recent libc++ in C++17 mode)
    
    Change-Id: I344fe128fab0f57a2c5f2dfc8c097e1ab2406508
    Reviewed-on: https://gerrit.libreoffice.org/45857
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 4dd438bf6660..6f46a3f5b11b 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1346,7 +1346,7 @@ bool OResultSet::OpenImpl()
                         }
 
                         m_pFileSet->get().erase(std::remove_if(m_pFileSet->get().begin(),m_pFileSet->get().end(),
-                                                            std::bind2nd(std::equal_to<sal_Int32>(),0))
+                                                            [](sal_Int32 n) { return n == 0; })
                                           ,m_pFileSet->get().end());
                     }
                 }
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 9234bdc39a36..49905f3e8f39 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1190,7 +1190,7 @@ void OResultSet::executeQuery()
                     }
                     // Now remove any keys marked with a 0
                     m_pKeySet->get().erase(std::remove_if(m_pKeySet->get().begin(),m_pKeySet->get().end()
-                                    ,std::bind2nd(std::equal_to<sal_Int32>(),0))
+                                    ,[](sal_Int32 n) { return n == 0; })
                                      ,m_pKeySet->get().end());
 
                 }