[Boost-commit] svn:boost r83941 - in trunk/boost/log: detail support

Subject: [Boost-commit] svn:boost r83941 - in trunk/boost/log: detail support
From: andrey.semashev_at_[hidden]
Date: 2013-04-17 14:01:00

Author: andysem
Date: 2013-04-17 14:00:56 EDT (Wed, 17 Apr 2013)
New Revision: 83941
URL: http://svn.boost.org/trac/boost/changeset/83941

Log:
Resolved name clashes with Apple macros. Removed Boost version check.
Text files modified: 
   trunk/boost/log/detail/config.hpp          |     5 -----                                   
   trunk/boost/log/detail/locks.hpp           |    12 ++++++------                            
   trunk/boost/log/support/regex.hpp          |     6 +++---                                  
   trunk/boost/log/support/spirit_classic.hpp |     6 +++---                                  
   trunk/boost/log/support/xpressive.hpp      |     6 +++---                                  
   5 files changed, 15 insertions(+), 20 deletions(-)

Modified: trunk/boost/log/detail/config.hpp
==============================================================================
--- trunk/boost/log/detail/config.hpp	(original)
+++ trunk/boost/log/detail/config.hpp	2013-04-17 14:00:56 EDT (Wed, 17 Apr 2013)
@@ -25,11 +25,6 @@
 
 #include <limits.h> // To bring in libc macros
 #include <boost/config.hpp>
-#include <boost/version.hpp>
-
-#if BOOST_VERSION < 104800
-#   error Boost.Log: Boost version 1.48 or later is required
-#endif
 
 #if defined(BOOST_NO_RTTI)
 #   error Boost.Log: RTTI is required by the library

Modified: trunk/boost/log/detail/locks.hpp
==============================================================================
--- trunk/boost/log/detail/locks.hpp	(original)
+++ trunk/boost/log/detail/locks.hpp	2013-04-17 14:00:56 EDT (Wed, 17 Apr 2013)
@@ -72,10 +72,10 @@
     struct false_type { char t[2]; };
 
     template< typename T >
-    static true_type check(T*, void (T::*)() = &T::lock, void (T::*)() = &T::unlock);
-    static false_type check(void*);
+    static true_type check_lockable(T*, void (T::*)() = &T::lock, void (T::*)() = &T::unlock);
+    static false_type check_lockable(void*);
 
-    enum value_t { value = sizeof(check((MutexT*)NULL)) == sizeof(true_type) };
+    enum value_t { value = sizeof(check_lockable((MutexT*)NULL)) == sizeof(true_type) };
 };
 
 //! A trait to detect if the mutex supports shared locking
@@ -86,10 +86,10 @@
     struct false_type { char t[2]; };
 
     template< typename T >
-    static true_type check(T*, void (T::*)() = &T::lock_shared, void (T::*)() = &T::unlock_shared);
-    static false_type check(void*);
+    static true_type check_shared_lockable(T*, void (T::*)() = &T::lock_shared, void (T::*)() = &T::unlock_shared);
+    static false_type check_shared_lockable(void*);
 
-    enum value_t { value = sizeof(check((MutexT*)NULL)) == sizeof(true_type) };
+    enum value_t { value = sizeof(check_shared_lockable((MutexT*)NULL)) == sizeof(true_type) };
 };
 
 //! An analogue to the minimalistic \c lock_guard template. Defined here to avoid including Boost.Thread.

Modified: trunk/boost/log/support/regex.hpp
==============================================================================
--- trunk/boost/log/support/regex.hpp	(original)
+++ trunk/boost/log/support/regex.hpp	2013-04-17 14:00:56 EDT (Wed, 17 Apr 2013)
@@ -40,12 +40,12 @@
     struct no_type { char dummy[2]; };
 
     template< typename CharT, typename TraitsT >
-    static yes_type check(basic_regex< CharT, TraitsT > const&);
-    static no_type check(...);
+    static yes_type check_regex(basic_regex< CharT, TraitsT > const&);
+    static no_type check_regex(...);
     static T& get_T();
 
 public:
-    enum { value = sizeof(check(get_T())) == sizeof(yes_type) };
+    enum { value = sizeof(check_regex(get_T())) == sizeof(yes_type) };
     typedef mpl::bool_< value > type;
 };
 

Modified: trunk/boost/log/support/spirit_classic.hpp
==============================================================================
--- trunk/boost/log/support/spirit_classic.hpp	(original)
+++ trunk/boost/log/support/spirit_classic.hpp	2013-04-17 14:00:56 EDT (Wed, 17 Apr 2013)
@@ -60,12 +60,12 @@
     struct no_type { char dummy[2]; };
 
     template< typename U >
-    static yes_type check(spirit::classic::parser< U > const&);
-    static no_type check(...);
+    static yes_type check_spirit_classic_parser(spirit::classic::parser< U > const&);
+    static no_type check_spirit_classic_parser(...);
     static T& get_T();
 
 public:
-    enum { value = sizeof(check(get_T())) == sizeof(yes_type) };
+    enum { value = sizeof(check_spirit_classic_parser(get_T())) == sizeof(yes_type) };
     typedef mpl::bool_< value > type;
 };
 

Modified: trunk/boost/log/support/xpressive.hpp
==============================================================================
--- trunk/boost/log/support/xpressive.hpp	(original)
+++ trunk/boost/log/support/xpressive.hpp	2013-04-17 14:00:56 EDT (Wed, 17 Apr 2013)
@@ -42,12 +42,12 @@
     struct no_type { char dummy[2]; };
 
     template< typename U >
-    static yes_type check(xpressive::basic_regex< U > const&);
-    static no_type check(...);
+    static yes_type check_xpressive_regex(xpressive::basic_regex< U > const&);
+    static no_type check_xpressive_regex(...);
     static T& get_T();
 
 public:
-    enum { value = sizeof(check(get_T())) == sizeof(yes_type) };
+    enum { value = sizeof(check_xpressive_regex(get_T())) == sizeof(yes_type) };
     typedef mpl::bool_< value > type;
 };