diff --git a/Packets/Packet.cti b/Packets/Packet.cti index bea5af7c8db44e8a540dc36b38e13ef0f52d3dc5..b58b78374d8a3c254c8d5f6d20198836779e83c0 100644 --- a/Packets/Packet.cti +++ b/Packets/Packet.cti @@ -175,8 +175,9 @@ senf::ConcretePacket<PacketType>::create(size_type size, senf::NoInit_t) template <class PacketType> template <class ForwardReadableRange> -prefix_ senf::ConcretePacket<PacketType> -senf::ConcretePacket<PacketType>::create(ForwardReadableRange const & range) +prefix_ senf::ConcretePacket<PacketType> senf::ConcretePacket<PacketType>:: +create(ForwardReadableRange const & range, + typename boost::disable_if< boost::is_integral<ForwardReadableRange> >::type *) { return ConcretePacket(interpreter::create(range)); } @@ -213,8 +214,9 @@ senf::ConcretePacket<PacketType>::createAfter(Packet packet, size_type size, sen template <class PacketType> template <class ForwardReadableRange> -prefix_ senf::ConcretePacket<PacketType> -senf::ConcretePacket<PacketType>::createAfter(Packet packet, ForwardReadableRange const & range) +prefix_ senf::ConcretePacket<PacketType> senf::ConcretePacket<PacketType>:: +createAfter(Packet packet, ForwardReadableRange const & range, + typename boost::disable_if< boost::is_integral<ForwardReadableRange> >::type *) { return ConcretePacket(interpreter::createAfter(packet.ptr(), range)); } diff --git a/Packets/Packet.hh b/Packets/Packet.hh index 18b3020afeed6fbf711686466f19c1267db3157d..f08a996a87bf4fa760ed9246ad9519476af3b1f0 100644 --- a/Packets/Packet.hh +++ b/Packets/Packet.hh @@ -28,7 +28,8 @@ // Custom includes #include <boost/operators.hpp> - +#include <boost/utility.hpp> +#include <boost/type_traits/is_integral.hpp> #include "../Utils/Exception.hh" #include "../Utils/Tags.hh" #include "../Utils/safe_bool.hh" @@ -465,6 +466,12 @@ namespace senf { \param[in] size Size of the packet to create in bytes \param[in] senf::noinit This parameter must always have the value \c senf::noinit. */ +#ifndef DOXYGEN + template <class ForwardReadableRange> + static ConcretePacket create( + ForwardReadableRange const & range, + typename boost::disable_if< boost::is_integral<ForwardReadableRange> >::type * = 0); +#else template <class ForwardReadableRange> static ConcretePacket create(ForwardReadableRange const & range); ///< Create packet from given data @@ -475,6 +482,7 @@ namespace senf { \param[in] range <a href="http://www.boost.org/libs/range/index.html">Boost.Range</a> of data to construct packet from. */ +#endif // Create packet as new packet after a given packet @@ -516,6 +524,13 @@ namespace senf { \param[in] size Size of the packet to create in bytes \param[in] senf::noinit This parameter must always have the value \c senf::noinit. */ +#ifndef DOXYGEN + template <class ForwardReadableRange> + static ConcretePacket createAfter( + Packet packet, + ForwardReadableRange const & range, + typename boost::disable_if< boost::is_integral<ForwardReadableRange> >::type * = 0); +#else template <class ForwardReadableRange> static ConcretePacket createAfter(Packet packet, ForwardReadableRange const & range); @@ -530,6 +545,7 @@ namespace senf { \param[in] range <a href="http://www.boost.org/libs/range/index.html">Boost.Range</a> of data to construct packet from. */ +#endif // Create packet as new packet (header) before a given packet diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc index 5a6fd975aca8934b5d930a78b91ce4e4f87305a5..937901c977e6d7ca475dc3acb355789cb10d3b7c 100644 --- a/Packets/Packet.test.cc +++ b/Packets/Packet.test.cc @@ -197,7 +197,8 @@ BOOST_AUTO_UNIT_TEST(concretePacket) BOOST_CHECK_EQUAL( FooPacket::create().size(), 4u ); BOOST_CHECK_EQUAL( FooPacket::create(senf::noinit).size(), 0u ); BOOST_CHECK_THROW( FooPacket::create(2u), senf::TruncatedPacketException ); - BOOST_CHECK_EQUAL( FooPacket::create(10u).size(), 10u ); + // No 'u' suffix here to check, that the disable_if works ... + BOOST_CHECK_EQUAL( FooPacket::create(10).size(), 10u ); BOOST_CHECK_EQUAL( FooPacket::create(2u,senf::noinit).size(), 2u ); BOOST_CHECK_EQUAL( FooPacket::create(data).size(), 6u ); @@ -210,7 +211,8 @@ BOOST_AUTO_UNIT_TEST(concretePacket) BOOST_CHECK_EQUAL( packet.size(), 4u ); BOOST_CHECK_THROW( FooPacket::createAfter(packet,2u), senf::TruncatedPacketException ); - BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,10u).size(), 10u ); + // No 'u' suffix here to check, that the disable_if works ... + BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,10).size(), 10u ); BOOST_CHECK_EQUAL( packet.size(), 14u ); BOOST_CHECK_EQUAL( FooPacket::createAfter(packet,2u,senf::noinit).size(), 2u );