feedc0de/boost_function
1
0
Fork 0
forked from boostorg/function
Code Pull Requests Activity

Remove BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX workarounds

Browse Source
This commit is contained in:
Peter Dimov
2024-01-27 07:12:35 +02:00
parent 2570672623
commit 3254a3857a
4 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/function/detail/epilogue.hpp
View File

@ -10,8 +10,6 @@
// Resolve C++20 issue with fn == bind(...) // Resolve C++20 issue with fn == bind(...)
// https://github.com/boostorg/function/issues/45 // https://github.com/boostorg/function/issues/45
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
namespace boost namespace boost
{ {
@ -34,6 +32,4 @@ template<class S, class R, class F, class L> bool operator!=( function<S> const&
} // namespace boost } // namespace boost
#endif // #if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
#endif // #ifndef BOOST_FUNCTION_EPILOGUE_HPP #endif // #ifndef BOOST_FUNCTION_EPILOGUE_HPP

7
include/boost/function/function_fwd.hpp
View File

@ -10,15 +10,9 @@
#define BOOST_FUNCTION_FWD_HPP #define BOOST_FUNCTION_FWD_HPP
#include <boost/config.hpp> #include <boost/config.hpp>
#if defined(BOOST_BCB_PARTIAL_SPECIALIZATION_BUG) \
|| !(defined(BOOST_STRICT_CONFIG) || !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540)
# define BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX
#endif
namespace boost { namespace boost {
class bad_function_call; class bad_function_call;
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
// Preferred syntax // Preferred syntax
template<typename Signature> class function; template<typename Signature> class function;
@ -27,7 +21,6 @@ namespace boost {
{ {
f1.swap(f2); f1.swap(f2);
} }
#endif // have partial specialization
// Portable syntax // Portable syntax
template<typename R, typename... T> class function_n; template<typename R, typename... T> class function_n;

7
include/boost/function/function_template.hpp
View File

@ -1020,13 +1020,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
R BOOST_FUNCTION_COMMA R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_ARGS>& ); BOOST_FUNCTION_TEMPLATE_ARGS>& );
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
#if BOOST_FUNCTION_NUM_ARGS == 0
#define BOOST_FUNCTION_PARTIAL_SPEC R (void)
#else
#define BOOST_FUNCTION_PARTIAL_SPEC R (BOOST_FUNCTION_TEMPLATE_ARGS) #define BOOST_FUNCTION_PARTIAL_SPEC R (BOOST_FUNCTION_TEMPLATE_ARGS)
#endif
template<typename R BOOST_FUNCTION_COMMA template<typename R BOOST_FUNCTION_COMMA
BOOST_FUNCTION_TEMPLATE_PARMS> BOOST_FUNCTION_TEMPLATE_PARMS>
@ -1119,7 +1113,6 @@ public:
}; };
#undef BOOST_FUNCTION_PARTIAL_SPEC #undef BOOST_FUNCTION_PARTIAL_SPEC
#endif // have partial specialization
} // end namespace boost } // end namespace boost

4
test/contains_test.cpp
View File

@ -133,7 +133,6 @@ static void equal_test()
BOOST_CHECK(f.contains(contain_test::ReturnIntFE(17))); BOOST_CHECK(f.contains(contain_test::ReturnIntFE(17)));
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
boost::function<int(void)> g; boost::function<int(void)> g;
g = &forty_two; g = &forty_two;
@ -149,7 +148,6 @@ static void equal_test()
BOOST_CHECK(&forty_two != g); BOOST_CHECK(&forty_two != g);
BOOST_CHECK(ReturnInt(17) == g); BOOST_CHECK(ReturnInt(17) == g);
BOOST_CHECK(ReturnInt(16) != g); BOOST_CHECK(ReturnInt(16) != g);
#endif
} }
static void ref_equal_test() static void ref_equal_test()
@ -180,7 +178,6 @@ static void ref_equal_test()
BOOST_CHECK(!(ri2 != f)); BOOST_CHECK(!(ri2 != f));
} }
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
{ {
ReturnInt ri(17); ReturnInt ri(17);
boost::function<int(void)> f = boost::ref(ri); boost::function<int(void)> f = boost::ref(ri);
@ -206,7 +203,6 @@ static void ref_equal_test()
BOOST_CHECK(ri2 == f); BOOST_CHECK(ri2 == f);
BOOST_CHECK(!(ri2 != f)); BOOST_CHECK(!(ri2 != f));
} }
#endif
} }
int main() int main()