2
0
mirror of https://github.com/boostorg/log.git synced 2026-02-10 23:42:22 +00:00

Merged latest changes from trunk.

[SVN r85986]
This commit is contained in:
Andrey Semashev
2013-09-28 16:11:45 +00:00
parent bf9c04dc9a
commit f01ecd2e7c
15 changed files with 51 additions and 43 deletions

View File

@@ -151,12 +151,10 @@ public:
}
};
} // namespace
//! Parses the named scope format string and constructs the formatter function
template< typename CharT >
boost::log::aux::light_function< void (basic_formatting_ostream< CharT >&, attributes::named_scope::value_type::value_type const&) >
parse_named_scope_format(const CharT* begin, const CharT* end)
BOOST_FORCEINLINE boost::log::aux::light_function< void (basic_formatting_ostream< CharT >&, attributes::named_scope::value_type::value_type const&) >
do_parse_named_scope_format(const CharT* begin, const CharT* end)
{
typedef CharT char_type;
typedef boost::log::aux::light_function< void (basic_formatting_ostream< char_type >&, attributes::named_scope::value_type::value_type const&) > result_type;
@@ -217,20 +215,28 @@ parse_named_scope_format(const CharT* begin, const CharT* end)
return result_type(boost::move(fmt));
}
} // namespace
#ifdef BOOST_LOG_USE_CHAR
template BOOST_LOG_API
boost::log::aux::light_function< void (basic_formatting_ostream< char >&, attributes::named_scope::value_type::value_type const&) >
parse_named_scope_format(const char* begin, const char* end);
//! Parses the named scope format string and constructs the formatter function
BOOST_LOG_API boost::log::aux::light_function< void (basic_formatting_ostream< char >&, attributes::named_scope::value_type::value_type const&) >
parse_named_scope_format(const char* begin, const char* end)
{
return do_parse_named_scope_format(begin, end);
}
#endif // BOOST_LOG_USE_CHAR
#ifdef BOOST_LOG_USE_WCHAR_T
template BOOST_LOG_API
boost::log::aux::light_function< void (basic_formatting_ostream< wchar_t >&, attributes::named_scope::value_type::value_type const&) >
parse_named_scope_format(const wchar_t* begin, const wchar_t* end);
//! Parses the named scope format string and constructs the formatter function
BOOST_LOG_API boost::log::aux::light_function< void (basic_formatting_ostream< wchar_t >&, attributes::named_scope::value_type::value_type const&) >
parse_named_scope_format(const wchar_t* begin, const wchar_t* end)
{
return do_parse_named_scope_format(begin, end);
}
#endif // BOOST_LOG_USE_WCHAR_T