[Boost-commit] svn:boost r85033 - trunk/libs/log/src

Subject: [Boost-commit] svn:boost r85033 - trunk/libs/log/src
From: andrey.semashev_at_[hidden]
Date: 2013-07-14 07:58:19

Author: andysem
Date: 2013-07-14 07:58:19 EDT (Sun, 14 Jul 2013)
New Revision: 85033
URL: http://svn.boost.org/trac/boost/changeset/85033

Log:
Fixed compilation on MSVC.

Text files modified: 
   trunk/libs/log/src/default_filter_factory.cpp    |     4 ++--                                    
   trunk/libs/log/src/default_formatter_factory.cpp |     7 +++++--                                 
   trunk/libs/log/src/formatter_parser.cpp          |     3 ---                                     
   3 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/libs/log/src/default_filter_factory.cpp
==============================================================================
--- trunk/libs/log/src/default_filter_factory.cpp	Sun Jul 14 07:36:57 2013	(r85032)
+++ trunk/libs/log/src/default_filter_factory.cpp	2013-07-14 07:58:19 EDT (Sun, 14 Jul 2013)	(r85033)
@@ -13,7 +13,7 @@
  *         at http://www.boost.org/libs/log/doc/log.html.
  */
 
-#if !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
+#if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
 
 #include <string>
 #include <boost/move/core.hpp>
@@ -398,4 +398,4 @@
 
 #include <boost/log/detail/footer.hpp>
 
-#endif // !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
+#endif // !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)

Modified: trunk/libs/log/src/default_formatter_factory.cpp
==============================================================================
--- trunk/libs/log/src/default_formatter_factory.cpp	Sun Jul 14 07:36:57 2013	(r85032)
+++ trunk/libs/log/src/default_formatter_factory.cpp	2013-07-14 07:58:19 EDT (Sun, 14 Jul 2013)	(r85033)
@@ -13,7 +13,10 @@
  *         at http://www.boost.org/libs/log/doc/log.html.
  */
 
-#if !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
+#if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
+
+#undef BOOST_MPL_LIMIT_VECTOR_SIZE
+#define BOOST_MPL_LIMIT_VECTOR_SIZE 50
 
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/copy.hpp>
@@ -95,4 +98,4 @@
 
 #include <boost/log/detail/footer.hpp>
 
-#endif // !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
+#endif // !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)

Modified: trunk/libs/log/src/formatter_parser.cpp
==============================================================================
--- trunk/libs/log/src/formatter_parser.cpp	Sun Jul 14 07:36:57 2013	(r85032)
+++ trunk/libs/log/src/formatter_parser.cpp	2013-07-14 07:58:19 EDT (Sun, 14 Jul 2013)	(r85033)
@@ -15,9 +15,6 @@
 
 #ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS
 
-#undef BOOST_MPL_LIMIT_VECTOR_SIZE
-#define BOOST_MPL_LIMIT_VECTOR_SIZE 50
-
 #include <ctime>
 #include <map>
 #include <string>