Skip to content

Commit

Permalink
Merge pull request #25393 from gartung/FWCore-Framework-make-shared-m…
Browse files Browse the repository at this point in the history
…acos-upd

FWCore/Framework: fix make_shared_noexcept_false template for macOS
  • Loading branch information
cmsbuild committed Dec 4, 2018
2 parents c4e05b0 + 8f9781d commit 4d50b8f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions FWCore/Framework/src/make_shared_noexcept_false.h
Expand Up @@ -4,10 +4,10 @@
namespace edm {
template<typename T, typename ... Args>
std::shared_ptr<T> make_shared_noexcept_false(Args&& ... args) {
#if defined(__APPLE)
#if defined(__APPLE__)
// libc++ from Apple Clang does not allow non-default destructors
// in some cases the destructor uses noexcept(false).
return std::shared_ptr<T>( new T(std::forward<Args>(args)... );
return std::shared_ptr<T>( new T(std::forward<Args>(args)... ));
#else
return std::make_shared<T>(std::forward<Args>(args)... );
#endif
Expand Down

0 comments on commit 4d50b8f

Please sign in to comment.