]> CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit
Merge r308143 from stable/10:
authordim <dim@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 31 Oct 2016 18:45:01 +0000 (18:45 +0000)
committerdim <dim@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Mon, 31 Oct 2016 18:45:01 +0000 (18:45 +0000)
commitb82ce2e016d9cca015546b425e4cee68f323ab1d
tree9adc5db6298092090e9477230191c3838ba356ba
parent71c21c52739512234ecd3ebb944bd2bf0f986ed0
Merge r308143 from stable/10:

Pull in r228705 from upstream libc++ trunk (by Eric Fiselier):

  [libcxx] Fix PR 22468 - std::function<void()> does not accept
  non-void-returning functions

  Summary:
  The bug can be found here: https://llvm.org/bugs/show_bug.cgi?id=22468

  `__invoke_void_return_wrapper` is needed to properly handle calling a
  function that returns a value but where the std::function return type
  is void. Without this '-Wsystem-headers' will cause
  `function::operator()(...)` to not compile.

  Reviewers: eugenis, K-ballo, mclow.lists

  Reviewed By: mclow.lists

  Subscribers: cfe-commits

  Differential Revision: https://reviews.llvm.org/D7444

This should allow newer versions of the graphics/aseprite port to
compile without modification.

Direct commit to stable/10, since stable/11 and head already have this
change.

Reported by: yuri@rawbw.com
PR: 213773

git-svn-id: svn://svn.freebsd.org/base/stable/9@308146 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
contrib/libc++/include/__functional_03
contrib/libc++/include/__functional_base
contrib/libc++/include/__functional_base_03
contrib/libc++/include/functional