[Boost-commit] svn:boost r85874 - in trunk: boost/log/detail libs/log/src

Subject: [Boost-commit] svn:boost r85874 - in trunk: boost/log/detail libs/log/src
From: andrey.semashev_at_[hidden]
Date: 2013-09-24 16:50:49

Author: andysem
Date: 2013-09-24 16:50:49 EDT (Tue, 24 Sep 2013)
New Revision: 85874
URL: http://svn.boost.org/trac/boost/changeset/85874

Log:
Some old config macros removed.

Text files modified: 
   trunk/boost/log/detail/config.hpp         |    16 +++-------------                        
   trunk/libs/log/src/formatter_parser.cpp   |     2 +-                                      
   trunk/libs/log/src/init_from_settings.cpp |     2 +-                                      
   trunk/libs/log/src/text_file_backend.cpp  |     2 +-                                      
   4 files changed, 6 insertions(+), 16 deletions(-)

Modified: trunk/boost/log/detail/config.hpp
==============================================================================
--- trunk/boost/log/detail/config.hpp	Tue Sep 24 16:20:34 2013	(r85873)
+++ trunk/boost/log/detail/config.hpp	2013-09-24 16:50:49 EDT (Tue, 24 Sep 2013)	(r85874)
@@ -53,8 +53,8 @@
 #       define BOOST_LOG_BROKEN_TEMPLATE_DEFINITION_MATCHING
 #   endif
 #   if _MSC_VER <= 1400
-        // Older MSVC versions reject friend declarations for class template instantiations
-#       define BOOST_LOG_BROKEN_FRIEND_TEMPLATE_INSTANTIATIONS
+        // Older MSVC versions reject friend declarations for class template specializations
+#       define BOOST_LOG_BROKEN_FRIEND_TEMPLATE_SPECIALIZATIONS
 #   endif
 #   if _MSC_VER <= 1600
         // MSVC up to 10.0 attempts to invoke copy constructor when initializing a const reference from rvalue returned from a function.
@@ -99,16 +99,6 @@
 #   endif
 #endif
 
-#if (defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x530)) && !defined(BOOST_NO_COMPILER_CONFIG)
-    // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
-#   define BOOST_LOG_NO_UNSPECIFIED_BOOL
-#endif // (defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x530)) && !defined(BOOST_NO_COMPILER_CONFIG)
-
-#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1))
-    // GCC 4.0.0 (and probably older) can't cope with some optimizations regarding string literals
-#   define BOOST_LOG_BROKEN_STRING_LITERALS
-#endif
-
 #if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)
     // GCC 4.1 and 4.2 have buggy anonymous namespaces support, which interferes with symbol linkage
 #   define BOOST_LOG_ANONYMOUS_NAMESPACE namespace anonymous {} using namespace anonymous; namespace anonymous
@@ -154,7 +144,7 @@
 
 // Some compilers support a special attribute that shows that a function won't return
 #if defined(__GNUC__) || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
-    // GCC and (supposedly) Sun Studio 12 support attribute syntax
+    // GCC and Sun Studio 12 support attribute syntax
 #   define BOOST_LOG_NORETURN __attribute__((noreturn))
 #elif defined (_MSC_VER)
     // Microsoft-compatible compilers go here

Modified: trunk/libs/log/src/formatter_parser.cpp
==============================================================================
--- trunk/libs/log/src/formatter_parser.cpp	Tue Sep 24 16:20:34 2013	(r85873)
+++ trunk/libs/log/src/formatter_parser.cpp	2013-09-24 16:50:49 EDT (Tue, 24 Sep 2013)	(r85874)
@@ -61,7 +61,7 @@
     //! 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;

Modified: trunk/libs/log/src/init_from_settings.cpp
==============================================================================
--- trunk/libs/log/src/init_from_settings.cpp	Tue Sep 24 16:20:34 2013	(r85873)
+++ trunk/libs/log/src/init_from_settings.cpp	2013-09-24 16:50:49 EDT (Tue, 24 Sep 2013)	(r85874)
@@ -603,7 +603,7 @@
 {
     typedef log::aux::lazy_singleton< sinks_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< sinks_repository< CharT > >;
 #else
     friend class base_type;

Modified: trunk/libs/log/src/text_file_backend.cpp
==============================================================================
--- trunk/libs/log/src/text_file_backend.cpp	Tue Sep 24 16:20:34 2013	(r85873)
+++ trunk/libs/log/src/text_file_backend.cpp	2013-09-24 16:50:49 EDT (Tue, 24 Sep 2013)	(r85874)
@@ -571,7 +571,7 @@
         //! Base type
         typedef log::aux::lazy_singleton< file_collector_repository, shared_ptr< file_collector_repository > > base_type;
 
-#if !defined(BOOST_LOG_BROKEN_FRIEND_TEMPLATE_INSTANTIATIONS)
+#if !defined(BOOST_LOG_BROKEN_FRIEND_TEMPLATE_SPECIALIZATIONS)
         friend class log::aux::lazy_singleton< file_collector_repository, shared_ptr< file_collector_repository > >;
 #else
         friend class base_type;