Mercurial > hg > vamp-build-and-test

diff DEPENDENCIES/generic/include/boost/signals2/detail/slot_template.hpp @ 101:c530137014c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/signals2/detail/slot_template.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/signals2/detail/slot_template.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -22,12 +22,16 @@
 {
   namespace signals2
   {
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
     template<typename Signature, typename SlotFunction> class slot;
+#else
+    template<typename Signature, typename SlotFunction = boost::function<Signature> >
+      class slot;
 
-    // slot class template.
-    template<BOOST_SIGNALS2_SIGNATURE_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS),
-      typename SlotFunction = BOOST_SIGNALS2_FUNCTION_N_DECL(BOOST_SIGNALS2_NUM_ARGS)>
-      class BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS);
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1900)
+    template<typename Signature, typename SlotFunction> class slot{};
+#endif
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
     template<BOOST_SIGNALS2_SLOT_TEMPLATE_SPECIALIZATION_DECL(BOOST_SIGNALS2_NUM_ARGS)>
       class BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) BOOST_SIGNALS2_SLOT_TEMPLATE_SPECIALIZATION