From 99e60d8d62b69d8b0b22d54e3f55c5151e7a2c2f Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Fri, 8 May 2015 17:29:01 +0900 Subject: std::ptr_fun became deprecated since C++11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If93609d032c9864e0251230bf9ed76e6b6741a62 Reviewed-on: https://gerrit.libreoffice.org/15672 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- jvmfwk/source/framework.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index ddfc4bfbea55..7035bba85dc1 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -136,7 +136,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi //the same JRE it_info it_duplicate = std::find_if(vecInfoManual.begin(), vecInfoManual.end(), - std::bind2nd(std::ptr_fun(areEqualJavaInfo), aInfo)); + std::bind(areEqualJavaInfo, std::placeholders::_1, aInfo)); if (it_duplicate == vecInfoManual.end()) vecInfoManual.push_back(aInfo); } @@ -165,7 +165,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi { it_info it_duplicate = std::find_if(vecInfoManual2.begin(), vecInfoManual2.end(), - std::bind2nd(std::ptr_fun(areEqualJavaInfo), *j)); + std::bind(areEqualJavaInfo, std::placeholders::_1, *j)); if (it_duplicate != vecInfoManual2.end()) vecInfoManual2.erase(it_duplicate); } -- cgit v1.2.3