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

@@ -61,7 +61,7 @@ struct formatters_repository :
//! Base class type
typedef log::aux::lazy_singleton< formatters_repository< CharT > > base_type;
#if !defined(BOOST_LOG_BROKEN_FRIEND_TEMPLATE_INSTANTIATIONS)
#if !defined(BOOST_LOG_BROKEN_FRIEND_TEMPLATE_SPECIALIZATIONS)
friend class log::aux::lazy_singleton< formatters_repository< CharT > >;
#else
friend class base_type;