From dfd00463adfac9858939ee898a76f493e49bbc68 Mon Sep 17 00:00:00 2001 From: g0dil <g0dil@wiback.org> Date: Mon, 23 Jul 2007 16:26:40 +0000 Subject: [PATCH] Add #ifndef DOXYGEN comments to implementation too --- Packets/PacketData.cti | 7 +++++++ Packets/PacketParser.ct | 6 ++++++ Packets/PacketParser.cti | 6 ++++++ Packets/PacketParser.hh | 29 +++++++++++++++++------------ Packets/ParseList.ct | 8 ++++++++ Packets/ParseVec.ct | 8 ++++++++ Socket/ClientSocketHandle.cti | 9 +++++++++ Socket/LLAddressing.cti | 7 +++++++ 8 files changed, 68 insertions(+), 12 deletions(-) diff --git a/Packets/PacketData.cti b/Packets/PacketData.cti index ffe2417ab..8486d879b 100644 --- a/Packets/PacketData.cti +++ b/Packets/PacketData.cti @@ -33,6 +33,7 @@ // Modifying the raw packet data +#ifndef DOXYGEN template <class InputIterator> prefix_ void senf::PacketData:: insert(iterator pos, InputIterator f, InputIterator l, @@ -40,6 +41,12 @@ insert(iterator pos, InputIterator f, InputIterator l, { impl().insert(this,pos,f,l); } +#else +template <class InputIterator> +prefix_ void senf::PacketData:: +insert(iterator pos, InputIterator f, InputIterator l) +{} +#endif ///////////////////////////////cti.e/////////////////////////////////////// #undef prefix_ diff --git a/Packets/PacketParser.ct b/Packets/PacketParser.ct index 5dd16a747..47e417794 100644 --- a/Packets/PacketParser.ct +++ b/Packets/PacketParser.ct @@ -28,6 +28,7 @@ #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// +#ifndef DOXYGEN template <class Parser> prefix_ typename boost::enable_if< boost::is_base_of<senf::PacketParserBase, Parser>, @@ -45,6 +46,11 @@ prefix_ typename boost::enable_if< PacketParserBase::data_iterator(new_target.i()) ); return new_target; } +#else +template <class Parser> +prefix_ Parser senf::operator<<(Parser target, Parser source) +{} +#endif ///////////////////////////////ct.e//////////////////////////////////////// #undef prefix_ diff --git a/Packets/PacketParser.cti b/Packets/PacketParser.cti index 4945e3d1c..777531bf9 100644 --- a/Packets/PacketParser.cti +++ b/Packets/PacketParser.cti @@ -59,6 +59,7 @@ prefix_ senf::PacketParserBase::size_type senf::bytes(Parser p) return detail::packetParserSize(p,0); } +#ifndef DOXYGEN template <class Parser, class Value> prefix_ typename boost::enable_if_c < boost::is_base_of<senf::PacketParserBase, Parser>::value @@ -68,6 +69,11 @@ prefix_ typename boost::enable_if_c < target.value(value); return target; } +#else +template <class Parser, class Value> +prefix_ Parser senf::operator<<(Parser target, Value const & value) +{} +#endif template <class Parser> prefix_ senf::PacketParserBase::size_type diff --git a/Packets/PacketParser.hh b/Packets/PacketParser.hh index 644e00d58..98fdbb25e 100644 --- a/Packets/PacketParser.hh +++ b/Packets/PacketParser.hh @@ -287,6 +287,13 @@ namespace senf { struct init_bytes : public detail::ParserInitBytes<Parser> {}; +# ifndef DOXYGEN + template <class Parser> + typename boost::enable_if< + boost::is_base_of<PacketParserBase, Parser>, + Parser >::type + operator<<(Parser target, Parser source); +# else /** \brief Generic parser copying This operator allows to copy the values of identical parsers. This operation does \e not @@ -299,17 +306,18 @@ namespace senf { \ingroup packetparser */ -# ifndef DOXYGEN - template <class Parser> - typename boost::enable_if< - boost::is_base_of<PacketParserBase, Parser>, - Parser >::type - operator<<(Parser target, Parser source); -# else template <class Parser> Parser operator<<(Parser target, Parser source); # endif +# ifndef DOXYGEN + template <class Parser, class Value> + typename boost::enable_if_c < + boost::is_base_of<PacketParserBase, Parser>::value + && ! boost::is_base_of<PacketParserBase, Value>::value, + Parser >::type + operator<<(Parser target, Value const & value); +# else /** \brief Generic parser value assignment This operator allows to assign a value to parsers which implement a <tt>value(</tt>\a @@ -319,11 +327,8 @@ namespace senf { \ingroup packetparser */ template <class Parser, class Value> - typename boost::enable_if_c < - boost::is_base_of<PacketParserBase, Parser>::value - && ! boost::is_base_of<PacketParserBase, Value>::value, - Parser >::type - operator<<(Parser target, Value const & value); + Parser operator<<(Parser target, Value const & value); +# endif /** \defgroup packetparsermacros Helper macros for defining new packet parsers diff --git a/Packets/ParseList.ct b/Packets/ParseList.ct index 45012bf7f..5cd98781c 100644 --- a/Packets/ParseList.ct +++ b/Packets/ParseList.ct @@ -99,6 +99,7 @@ prefix_ void senf::Parse_List_Container<ListPolicy>::insert(iterator pos, } } +#ifndef DOXYGEN template <class ListPolicy> template <class ForwardIterator> prefix_ void senf::Parse_List_Container<ListPolicy>:: @@ -116,6 +117,13 @@ insert(iterator pos, ForwardIterator f, ForwardIterator l, sp += senf::bytes(value_type(sp,state())); } } +#else +template <class ListPolicy> +template <class ForwardIterator> +prefix_ void senf::Parse_List_Container<ListPolicy>:: +insert(iterator pos, ForwardIterator f, ForwardIterator l) +{} +#endif template <class ListPolicy> prefix_ void senf::Parse_List_Container<ListPolicy>::erase(iterator pos, diff --git a/Packets/ParseVec.ct b/Packets/ParseVec.ct index 64493eb24..d76caf3ef 100644 --- a/Packets/ParseVec.ct +++ b/Packets/ParseVec.ct @@ -79,6 +79,7 @@ prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>::insert(iterator *j << t; } +#ifndef DOXYGEN template <class ElementParser, class Sizer> template <class ForwardIterator> prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>:: @@ -88,6 +89,13 @@ insert(iterator pos, ForwardIterator f, ForwardIterator l, for (iterator j (shift(pos,std::distance(f,l))); f!=l; ++f,++j) *j << *f; } +#else +template <class ElementParser, class Sizer> +template <class ForwardIterator> +prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>:: +insert(iterator pos, ForwardIterator f, ForwardIterator l) +{} +#endif template <class ElementParser, class Sizer> prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>::resize(size_type n) diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti index 96508800f..7f46c6cb0 100644 --- a/Socket/ClientSocketHandle.cti +++ b/Socket/ClientSocketHandle.cti @@ -138,6 +138,7 @@ senf::ClientSocketHandle<Policy>::operator=(ClientSocketHandle<OtherPolicy> othe // senf::ClientSocketHandle<Policy>::read +#ifndef DOXYGEN template <class Policy> template <class ForwardWritableRange> prefix_ typename boost::range_iterator<ForwardWritableRange>::type @@ -153,6 +154,14 @@ read(ForwardWritableRange const & range, >::value && sizeof(typename boost::range_value<ForwardWritableRange>::type)==sizeof(char) >::read(*this, range); } +#else +template <class Policy> +template <class ForwardWritableRange> +prefix_ typename boost::range_iterator<ForwardWritableRange>::type +senf::ClientSocketHandle<Policy>:: +read(ForwardWritableRange const & range) +{} +#endif template <class Policy> template <class ForwardWritableRange> diff --git a/Socket/LLAddressing.cti b/Socket/LLAddressing.cti index 42e9934a5..c40134345 100644 --- a/Socket/LLAddressing.cti +++ b/Socket/LLAddressing.cti @@ -32,6 +32,7 @@ #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// +#ifndef DOXYGEN template <class ForwardRange> prefix_ senf::LLSocketAddress:: LLSocketAddress(ForwardRange const & address, std::string interface, @@ -41,6 +42,12 @@ LLSocketAddress(ForwardRange const & address, std::string interface, this->address(address); this->interface(interface); } +#else +template <class ForwardRange> +prefix_ senf::LLSocketAddress:: +LLSocketAddress(ForwardRange const & address, std::string interface) +{} +#endif ///////////////////////////////cti.e/////////////////////////////////////// #undef prefix_ -- GitLab