diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-05-08 17:29:01 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-08 15:54:12 +0000 |
| commit | 99e60d8d62b69d8b0b22d54e3f55c5151e7a2c2f (patch) | |
| tree | 6385680c4ad53010b37982946d19643d7a35ae9a /jvmfwk | |
| parent | 12bb6a054d697efddee76269605ed2450a2fae9c (diff) | |
std::ptr_fun became deprecated since C++11
Change-Id: If93609d032c9864e0251230bf9ed76e6b6741a62
Reviewed-on: https://gerrit.libreoffice.org/15672
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/framework.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |