boostorg/core
1
0
Fork 1
mirror of https://github.com/boostorg/core.git synced 2025-07-30 12:57:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Peter Dimov
2015-06-05 15:44:48 +03:00
parent d0ec03e28b d9b28783e8
commit 89630fc2bf
3 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/boost/core/ignore_unused.hpp
View File

@ -14,53 +14,53 @@ namespace boost {
#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
template <typename... Ts> template <typename... Ts>
inline void ignore_unused(Ts const& ...) BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(Ts const& ...)
{} {}
template <typename... Ts> template <typename... Ts>
inline void ignore_unused() BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused()
{} {}
#else #else
template <typename T1> template <typename T1>
inline void ignore_unused(T1 const&) BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&)
{} {}
template <typename T1, typename T2> template <typename T1, typename T2>
inline void ignore_unused(T1 const&, T2 const&) BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&, T2 const&)
{} {}
template <typename T1, typename T2, typename T3> template <typename T1, typename T2, typename T3>
inline void ignore_unused(T1 const&, T2 const&, T3 const&) BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&, T2 const&, T3 const&)
{} {}
template <typename T1, typename T2, typename T3, typename T4> template <typename T1, typename T2, typename T3, typename T4>
inline void ignore_unused(T1 const&, T2 const&, T3 const&, T4 const&) BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&, T2 const&, T3 const&, T4 const&)
{} {}
template <typename T1, typename T2, typename T3, typename T4, typename T5> template <typename T1, typename T2, typename T3, typename T4, typename T5>
inline void ignore_unused(T1 const&, T2 const&, T3 const&, T4 const&, T5 const&) BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused(T1 const&, T2 const&, T3 const&, T4 const&, T5 const&)
{} {}
template <typename T1> template <typename T1>
inline void ignore_unused() BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused()
{} {}
template <typename T1, typename T2> template <typename T1, typename T2>
inline void ignore_unused() BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused()
{} {}
template <typename T1, typename T2, typename T3> template <typename T1, typename T2, typename T3>
inline void ignore_unused() BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused()
{} {}
template <typename T1, typename T2, typename T3, typename T4> template <typename T1, typename T2, typename T3, typename T4>
inline void ignore_unused() BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused()
{} {}
template <typename T1, typename T2, typename T3, typename T4, typename T5> template <typename T1, typename T2, typename T3, typename T4, typename T5>
inline void ignore_unused() BOOST_FORCEINLINE BOOST_CXX14_CONSTEXPR void ignore_unused()
{} {}
#endif #endif

4
include/boost/get_pointer.hpp
View File

@ -24,11 +24,15 @@ template<class T> T * get_pointer(T * p)
// get_pointer(shared_ptr<T> const & p) has been moved to shared_ptr.hpp // get_pointer(shared_ptr<T> const & p) has been moved to shared_ptr.hpp
#if !defined( BOOST_NO_AUTO_PTR )
template<class T> T * get_pointer(std::auto_ptr<T> const& p) template<class T> T * get_pointer(std::auto_ptr<T> const& p)
{ {
return p.get(); return p.get();
} }
#endif
#if !defined( BOOST_NO_CXX11_SMART_PTR ) #if !defined( BOOST_NO_CXX11_SMART_PTR )
template<class T> T * get_pointer( std::unique_ptr<T> const& p ) template<class T> T * get_pointer( std::unique_ptr<T> const& p )

11
test/ignore_unused_test.cpp
View File

@ -6,6 +6,12 @@
#include <boost/core/ignore_unused.hpp> #include <boost/core/ignore_unused.hpp>
BOOST_CXX14_CONSTEXPR int test_fun(int a)
{
boost::ignore_unused(a);
return 0;
}
int main() int main()
{ {
{ {
@ -60,5 +66,10 @@ int main()
boost::ignore_unused<a, b, c, d, e>(); boost::ignore_unused<a, b, c, d, e>();
} }
{
BOOST_CXX14_CONSTEXPR const int a = test_fun(0);
boost::ignore_unused(a);
}
return 0; return 0;
} }