Skip to content
Snippets Groups Projects
Commit 279c71a5 authored by g0dil's avatar g0dil
Browse files

Minor fixes

parent 204448c8
No related branches found
No related tags found
No related merge requests found
...@@ -91,11 +91,12 @@ namespace module { ...@@ -91,11 +91,12 @@ namespace module {
{ {
public: public:
typedef unspecified_type Handle; // type of handle requested typedef unspecified_type Handle; // type of handle requested
typedef unspecified_type PacketType // type of packet returned
SomeReader(); // EITHER default constructible SomeReader(); // EITHER default constructible
SomeReader(SomeReader const & other); // OR copy constructible SomeReader(SomeReader const & other); // OR copy constructible
Packet operator()(Handle handle); // extraction function PacketType operator()(Handle handle); // extraction function
}; };
\endcode \endcode
Whenever the FileHandle object is ready for reading, the \a Reader's \c operator() is called Whenever the FileHandle object is ready for reading, the \a Reader's \c operator() is called
......
...@@ -89,7 +89,7 @@ prefix_ void senf::log::detail::AreaBase::removeRoutingCache(Target & target, ...@@ -89,7 +89,7 @@ prefix_ void senf::log::detail::AreaBase::removeRoutingCache(Target & target,
prefix_ void senf::log::detail::AreaBase::write(time_type timestamp, prefix_ void senf::log::detail::AreaBase::write(time_type timestamp,
StreamBase const & stream, unsigned level, StreamBase const & stream, unsigned level,
std::string msg) std::string const & msg)
const const
{ {
if (stream.index >= routingCache_.size()) if (stream.index >= routingCache_.size())
......
...@@ -58,7 +58,7 @@ namespace detail { ...@@ -58,7 +58,7 @@ namespace detail {
void updateRoutingCache(Target & target, StreamBase const & stream, unsigned limit) const; void updateRoutingCache(Target & target, StreamBase const & stream, unsigned limit) const;
void removeRoutingCache(Target & target, StreamBase const & stream) const; void removeRoutingCache(Target & target, StreamBase const & stream) const;
void write(time_type timestamp, StreamBase const & stream, unsigned level, void write(time_type timestamp, StreamBase const & stream, unsigned level,
std::string msg) const; std::string const & msg) const;
private: private:
struct RouteEntry { struct RouteEntry {
......
...@@ -206,7 +206,7 @@ prefix_ void senf::log::Target::write(time_type timestamp, ...@@ -206,7 +206,7 @@ prefix_ void senf::log::Target::write(time_type timestamp,
prefix_ void senf::log::detail::TargetRegistry::write(StreamBase const & stream, prefix_ void senf::log::detail::TargetRegistry::write(StreamBase const & stream,
AreaBase const & area, unsigned level, AreaBase const & area, unsigned level,
std::string msg) std::string const & msg)
{ {
if (fallbackRouting_) { if (fallbackRouting_) {
if (level >= stream.defaultRuntimeLimit()) if (level >= stream.defaultRuntimeLimit())
......
...@@ -88,7 +88,7 @@ prefix_ void senf::log::Target::unroute(action_t action) ...@@ -88,7 +88,7 @@ prefix_ void senf::log::Target::unroute(action_t action)
// namespace senf::log::detail members // namespace senf::log::detail members
template <class Stream, class Area, class Level> template <class Stream, class Area, class Level>
prefix_ void senf::log::detail::write(std::string msg) prefix_ void senf::log::detail::write(std::string const & msg)
{ {
TargetRegistry::instance().write(Stream::instance(), Area::instance(), Level::value, msg); TargetRegistry::instance().write(Stream::instance(), Area::instance(), Level::value, msg);
} }
......
...@@ -45,7 +45,7 @@ namespace detail { ...@@ -45,7 +45,7 @@ namespace detail {
using senf::singleton<TargetRegistry>::instance; using senf::singleton<TargetRegistry>::instance;
void write(StreamBase const & stream, AreaBase const & area, unsigned level, void write(StreamBase const & stream, AreaBase const & area, unsigned level,
std::string msg); std::string const & msg);
void routed(); void routed();
bool fallbackRouting(); bool fallbackRouting();
...@@ -67,7 +67,7 @@ namespace detail { ...@@ -67,7 +67,7 @@ namespace detail {
/** \brief Internal: Write log message */ /** \brief Internal: Write log message */
template <class Stream, class Area, class Level> template <class Stream, class Area, class Level>
void write(std::string msg); void write(std::string const & msg);
#ifndef DOXYGEN #ifndef DOXYGEN
......
...@@ -41,6 +41,17 @@ senf::make_transform_range(Range const & range, Fn const & fn) ...@@ -41,6 +41,17 @@ senf::make_transform_range(Range const & range, Fn const & fn)
boost::make_transform_iterator(boost::end(range), fn) ); boost::make_transform_iterator(boost::end(range), fn) );
} }
template <class Range, class Fn>
prefix_ boost::iterator_range<
boost::transform_iterator< Fn,
typename boost::range_iterator<Range>::type > >
senf::make_transform_range(Range & range, Fn const & fn)
{
return boost::make_iterator_range(
boost::make_transform_iterator(boost::begin(range), fn),
boost::make_transform_iterator(boost::end(range), fn) );
}
///////////////////////////////cti.e/////////////////////////////////////// ///////////////////////////////cti.e///////////////////////////////////////
#undef prefix_ #undef prefix_
......
...@@ -46,6 +46,12 @@ namespace senf { ...@@ -46,6 +46,12 @@ namespace senf {
typename boost::range_const_iterator<Range>::type > > typename boost::range_const_iterator<Range>::type > >
make_transform_range(Range const & range, Fn const & fn); make_transform_range(Range const & range, Fn const & fn);
template <class Range, class Fn>
boost::iterator_range<
boost::transform_iterator< Fn,
typename boost::range_iterator<Range>::type > >
make_transform_range(Range & range, Fn const & fn);
} }
///////////////////////////////hh.e//////////////////////////////////////// ///////////////////////////////hh.e////////////////////////////////////////
......
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
(defun check-namespace-indent (arg) (defun check-namespace-indent (arg)
(save-excursion (save-excursion
(back-to-indentation) (back-to-indentation)
(if (looking-at "namespace") [0] '+))) (if (and (looking-at "namespace")
(not (looking-at ".*}")))
[0] '+)))
(defconst senf-c-style (defconst senf-c-style
'((c-basic-offset . 4) '((c-basic-offset . 4)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment