|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81709 - in branches/release: boost/signals2 boost/signals2/detail libs/signals2 libs/signals2/doc libs/signals2/test
From: marshall_at_[hidden]
Date: 2012-12-04 13:22:20
Author: marshall
Date: 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
New Revision: 81709
URL: http://svn.boost.org/trac/boost/changeset/81709
Log:
Merge macro changes for Boost.Signals2 to release
Properties modified:
branches/release/boost/signals2/ (props changed)
branches/release/libs/signals2/ (props changed)
branches/release/libs/signals2/doc/ (props changed)
Text files modified:
branches/release/boost/signals2/deconstruct.hpp | 10 +++++-----
branches/release/boost/signals2/detail/signal_template.hpp | 24 ++++++++++++------------
branches/release/boost/signals2/detail/signals_common_macros.hpp | 6 +++---
branches/release/boost/signals2/detail/slot_template.hpp | 12 ++++++------
branches/release/boost/signals2/signal.hpp | 2 +-
branches/release/boost/signals2/slot.hpp | 2 +-
branches/release/libs/signals2/doc/porting.xml | 2 +-
branches/release/libs/signals2/test/signal_n_test.cpp | 6 +++---
branches/release/libs/signals2/test/track_test.cpp | 4 ++--
9 files changed, 34 insertions(+), 34 deletions(-)
Modified: branches/release/boost/signals2/deconstruct.hpp
==============================================================================
--- branches/release/boost/signals2/deconstruct.hpp (original)
+++ branches/release/boost/signals2/deconstruct.hpp 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -63,7 +63,7 @@
}
return _sp;
}
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template<class... Args>
const shared_ptr<T>& postconstruct(Args && ... args)
{
@@ -75,7 +75,7 @@
}
return _sp;
}
-#else // !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template<typename A1>
const shared_ptr<T>& postconstruct(const A1 &a1) const
{
@@ -183,7 +183,7 @@
}
return _sp;
}
-#endif // !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#endif // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
private:
friend class boost::signals2::deconstruct_access;
postconstructor_invoker(const shared_ptr<T> & sp):
@@ -284,7 +284,7 @@
}
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
// Variadic templates, rvalue reference
@@ -472,7 +472,7 @@
return deconstruct_access::deconstruct<T>();
}
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
// Variadic templates, rvalue reference
Modified: branches/release/boost/signals2/detail/signal_template.hpp
==============================================================================
--- branches/release/boost/signals2/detail/signal_template.hpp (original)
+++ branches/release/boost/signals2/detail/signal_template.hpp 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -13,7 +13,7 @@
// This file is included iteratively, and should not be protected from multiple inclusion
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_SIGNALS2_NUM_ARGS BOOST_PP_ITERATION()
#else
#define BOOST_SIGNALS2_NUM_ARGS 1
@@ -132,11 +132,11 @@
typedef BOOST_SIGNALS2_EXTENDED_SLOT_TYPE(BOOST_SIGNALS2_NUM_ARGS) extended_slot_type;
typedef typename nonvoid<typename slot_function_type::result_type>::type nonvoid_slot_result_type;
private:
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
class slot_invoker;
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
typedef variadic_slot_invoker<nonvoid_slot_result_type, Args...> slot_invoker;
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
typedef slot_call_iterator_cache<nonvoid_slot_result_type, slot_invoker> slot_call_iterator_cache_type;
typedef typename group_key<Group>::type group_key_type;
typedef shared_ptr<connection_body<group_key_type, slot_type, Mutex> > connection_body_type;
@@ -311,7 +311,7 @@
typedef Mutex mutex_type;
// slot_invoker is passed to slot_call_iterator_t to run slots
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
class slot_invoker
{
public:
@@ -371,7 +371,7 @@
#undef BOOST_SIGNALS2_M_ARG_NAMES
#undef BOOST_SIGNALS2_M_ARG_NAME
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
// a struct used to optimize (minimize) the number of shared_ptrs that need to be created
// inside operator()
class invocation_state
@@ -618,7 +618,7 @@
slot_call_iterator;
typedef typename mpl::identity<BOOST_SIGNALS2_SIGNATURE_FUNCTION_TYPE(BOOST_SIGNALS2_NUM_ARGS)>::type signature_type;
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
// typedef Tn argn_type;
#define BOOST_SIGNALS2_MISC_STATEMENT(z, n, data) \
@@ -640,7 +640,7 @@
BOOST_STATIC_CONSTANT(int, arity = BOOST_SIGNALS2_NUM_ARGS);
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
template<unsigned n> class arg
{
@@ -649,7 +649,7 @@
};
BOOST_STATIC_CONSTANT(int, arity = sizeof...(Args));
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const combiner_type &combiner_arg = combiner_type(),
const group_compare_type &group_compare = group_compare_type()):
@@ -766,11 +766,11 @@
<BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> > _weak_pimpl;
};
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
template<int arity, typename Signature>
class extended_signature: public variadic_extended_signature<Signature>
{};
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
template<int arity, typename Signature>
class extended_signature;
// partial template specialization
@@ -810,7 +810,7 @@
GroupCompare, SlotFunction, ExtendedSlotFunction, Mutex> type;
};
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
} // namespace detail
} // namespace signals2
Modified: branches/release/boost/signals2/detail/signals_common_macros.hpp
==============================================================================
--- branches/release/boost/signals2/detail/signals_common_macros.hpp (original)
+++ branches/release/boost/signals2/detail/signals_common_macros.hpp 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -13,7 +13,7 @@
#include <boost/config.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#ifndef BOOST_SIGNALS2_MAX_ARGS
#define BOOST_SIGNALS2_MAX_ARGS 9
@@ -139,7 +139,7 @@
#define BOOST_SIGNALS2_PP_COMMA_IF(arity) BOOST_PP_COMMA_IF(arity)
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_SIGNALS2_SIGNAL_CLASS_NAME(arity) signal
#define BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(arity) weak_signal
@@ -208,6 +208,6 @@
#define BOOST_SIGNALS2_PP_COMMA_IF(arity) ,
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif // BOOST_SIGNALS2_SIGNALS_COMMON_MACROS_HPP
Modified: branches/release/boost/signals2/detail/slot_template.hpp
==============================================================================
--- branches/release/boost/signals2/detail/slot_template.hpp (original)
+++ branches/release/boost/signals2/detail/slot_template.hpp 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -11,7 +11,7 @@
// This file is included iteratively, and should not be protected from multiple inclusion
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_SIGNALS2_NUM_ARGS BOOST_PP_ITERATION()
#else
#define BOOST_SIGNALS2_NUM_ARGS 1
@@ -42,7 +42,7 @@
typedef R result_type;
typedef typename mpl::identity<BOOST_SIGNALS2_SIGNATURE_FUNCTION_TYPE(BOOST_SIGNALS2_NUM_ARGS)>::type signature_type;
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
// typedef Tn argn_type;
#define BOOST_SIGNALS2_MISC_STATEMENT(z, n, data) \
@@ -64,7 +64,7 @@
BOOST_STATIC_CONSTANT(int, arity = BOOST_SIGNALS2_NUM_ARGS);
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
template<unsigned n> class arg
{
@@ -73,7 +73,7 @@
};
BOOST_STATIC_CONSTANT(int, arity = sizeof...(Args));
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
template<typename F>
BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const F& f)
@@ -81,7 +81,7 @@
init_slot_function(f);
}
// copy constructors
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
template<BOOST_SIGNALS2_PREFIXED_SIGNATURE_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS, Other), typename OtherSlotFunction>
BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
<BOOST_SIGNALS2_PREFIXED_SIGNATURE_TEMPLATE_INSTANTIATION(BOOST_SIGNALS2_NUM_ARGS, Other), OtherSlotFunction> &other_slot):
@@ -161,7 +161,7 @@
SlotFunction _slot_function;
};
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
namespace detail
{
template<unsigned arity, typename Signature, typename SlotFunction>
Modified: branches/release/boost/signals2/signal.hpp
==============================================================================
--- branches/release/boost/signals2/signal.hpp (original)
+++ branches/release/boost/signals2/signal.hpp 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -32,7 +32,7 @@
#include <boost/throw_exception.hpp>
#include <functional>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#include <boost/signals2/preprocessed_signal.hpp>
#else
#include <boost/signals2/variadic_signal.hpp>
Modified: branches/release/boost/signals2/slot.hpp
==============================================================================
--- branches/release/boost/signals2/slot.hpp (original)
+++ branches/release/boost/signals2/slot.hpp 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -24,7 +24,7 @@
#include <boost/visit_each.hpp>
#include <boost/weak_ptr.hpp>
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#include <boost/signals2/preprocessed_slot.hpp>
#else
#include <boost/signals2/variadic_slot.hpp>
Modified: branches/release/libs/signals2/doc/porting.xml
==============================================================================
--- branches/release/libs/signals2/doc/porting.xml (original)
+++ branches/release/libs/signals2/doc/porting.xml 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -270,7 +270,7 @@
<para>
The following library features are
deprecated, and are only available if your compiler is NOT using
- variadic templates (i.e. BOOST_NO_VARIADIC_TEMPLATES is defined
+ variadic templates (i.e. BOOST_NO_CXX11_VARIADIC_TEMPLATES is defined
by Boost.Config).
<itemizedlist>
<listitem>
Modified: branches/release/libs/signals2/test/signal_n_test.cpp
==============================================================================
--- branches/release/libs/signals2/test/signal_n_test.cpp (original)
+++ branches/release/libs/signals2/test/signal_n_test.cpp 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -10,12 +10,12 @@
#include <boost/config.hpp>
#include <boost/test/minimal.hpp>
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
int test_main(int, char* [])
{
return 0;
}
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
#include <boost/optional.hpp>
#include <boost/ref.hpp>
@@ -300,4 +300,4 @@
return 0;
}
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
Modified: branches/release/libs/signals2/test/track_test.cpp
==============================================================================
--- branches/release/libs/signals2/test/track_test.cpp (original)
+++ branches/release/libs/signals2/test/track_test.cpp 2012-12-04 13:22:19 EST (Tue, 04 Dec 2012)
@@ -111,8 +111,8 @@
BOOST_CHECK(s1(2) == 0);
// there isn't a boost config macro that detects the existance of std::shared_ptr or std::weak_ptr,
-// so we rely on BOOST_NO_VARIADIC_TEMPLATES as a hack
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
+// so we rely on BOOST_NO_CXX11_VARIADIC_TEMPLATES as a hack
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
// Test tracking through std::shared_ptr/weak_ptr
BOOST_CHECK(s1(5) == 0);
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk