diff --git a/include/cpp/marshal/Boxed.hpp b/include/cpp/marshal/Boxed.hpp index 8224ffa40..5b3ecb2f9 100644 --- a/include/cpp/marshal/Boxed.hpp +++ b/include/cpp/marshal/Boxed.hpp @@ -23,20 +23,20 @@ inline void cpp::marshal::Boxed_obj::setFinaliser(std::false_type) {} template inline cpp::marshal::Boxed_obj::Boxed_obj() : value() { - setFinaliser(std::is_destructible{}); + setFinaliser(std::integral_constant::value && !std::is_trivially_destructible::value>{}); } template inline cpp::marshal::Boxed_obj::Boxed_obj(T* ptr) : value(*ptr) { - setFinaliser(std::is_destructible{}); + setFinaliser(std::integral_constant::value && !std::is_trivially_destructible::value>{}); } template template inline cpp::marshal::Boxed_obj::Boxed_obj(TArgs... args) : value(std::forward(args)...) { - setFinaliser(std::is_destructible{}); + setFinaliser(std::integral_constant::value && !std::is_trivially_destructible::value>{}); } #endif