From 4fadd968fa12130524c8380f33fcfe25d4de79e5 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 13 Sep 2017 11:24:46 +0900 Subject: Imported Upstream version 1.65.0 Change-Id: Icf8400b375482cb11bcf77440a6934ba360d6ba4 Signed-off-by: DongHun Kwak --- boost/test/data/monomorphic/singleton.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boost/test/data/monomorphic/singleton.hpp') diff --git a/boost/test/data/monomorphic/singleton.hpp b/boost/test/data/monomorphic/singleton.hpp index 586487a6d7..b0abd0eabb 100644 --- a/boost/test/data/monomorphic/singleton.hpp +++ b/boost/test/data/monomorphic/singleton.hpp @@ -81,7 +81,7 @@ struct is_dataset> : mpl::true_ {}; /// @overload boost::unit_test::data::make() template -inline typename std::enable_if::value && +inline typename std::enable_if::value && !monomorphic::is_dataset::value && !boost::is_array::type>::value, monomorphic::singleton -- cgit v1.2.3