update boost

linx64/include/boost/log/expressions/formatters/auto_newline.hpp

@@ -0,0 +1,46 @@
+/*
+ *             Copyright Andrey Semashev 2019.
+ * Distributed under the Boost Software License, Version 1.0.
+ *    (See accompanying file LICENSE_1_0.txt or copy at
+ *          https://www.boost.org/LICENSE_1_0.txt)
+ */
+/*!
+ * \file   expressions/formatters/auto_newline.hpp
+ * \author Andrey Semashev
+ * \date   23.06.2019
+ *
+ * The header contains implementation of formatter for inserting a newline, unless there is already one inserted.
+ */
+
+#ifndef BOOST_LOG_EXPRESSIONS_FORMATTERS_AUTO_NEWLINE_HPP_INCLUDED_
+#define BOOST_LOG_EXPRESSIONS_FORMATTERS_AUTO_NEWLINE_HPP_INCLUDED_
+
+#include <boost/log/detail/config.hpp>
+#include <boost/log/utility/manipulators/auto_newline.hpp>
+#include <boost/log/detail/header.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost {
+
+BOOST_LOG_OPEN_NAMESPACE
+
+namespace expressions {
+
+/*!
+ * Formatter for inserting a newline character, unless the last character
+ * inserted into the stream is already a newline.
+ */
+using boost::log::auto_newline;
+
+} // namespace expressions
+
+BOOST_LOG_CLOSE_NAMESPACE // namespace log
+
+} // namespace boost
+
+#include <boost/log/detail/footer.hpp>
+
+#endif // BOOST_LOG_EXPRESSIONS_FORMATTERS_AUTO_NEWLINE_HPP_INCLUDED_

linx64/include/boost/log/expressions/formatters/c_decorator.hpp

@@ -16,9 +16,9 @@
 #define BOOST_LOG_EXPRESSIONS_FORMATTERS_C_DECORATOR_HPP_INCLUDED_
 
 #include <limits>
+#include <boost/core/snprintf.hpp>
 #include <boost/range/iterator_range_core.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/detail/snprintf.hpp>
 #include <boost/log/expressions/formatters/char_decorator.hpp>
 #include <boost/log/detail/header.hpp>
 
@@ -60,8 +60,8 @@ struct c_decorator_traits< char >
     template< unsigned int N >
     static std::size_t print_escaped(char (&buf)[N], char c)
     {
-        int n = boost::log::aux::snprintf(buf, N, "\\x%.2X", static_cast< unsigned int >(static_cast< uint8_t >(c)));
-        if (n < 0)
+        int n = boost::core::snprintf(buf, N, "\\x%.2X", static_cast< unsigned int >(static_cast< uint8_t >(c)));
+        if (BOOST_UNLIKELY(n < 0))
         {
             n = 0;
             buf[0] = '\0';
@@ -112,8 +112,8 @@ struct c_decorator_traits< wchar_t >
             val = static_cast< uint32_t >(c);
         }
 
-        int n = boost::log::aux::swprintf(buf, N, format, val);
-        if (n < 0)
+        int n = boost::core::swprintf(buf, N, format, val);
+        if (BOOST_UNLIKELY(n < 0))
         {
             n = 0;
             buf[0] = L'\0';
@@ -154,10 +154,10 @@ struct c_decorator_gen
  * For wide-character formatting there is the similar \c wc_decor decorator generator object.
  */
 #ifdef BOOST_LOG_USE_CHAR
-const aux::c_decorator_gen< char > c_decor = {};
+BOOST_INLINE_VARIABLE const aux::c_decorator_gen< char > c_decor = {};
 #endif
 #ifdef BOOST_LOG_USE_WCHAR_T
-const aux::c_decorator_gen< wchar_t > wc_decor = {};
+BOOST_INLINE_VARIABLE const aux::c_decorator_gen< wchar_t > wc_decor = {};
 #endif
 
 /*!
@@ -254,10 +254,10 @@ struct c_ascii_decorator_gen
  * For wide-character formatting there is the similar \c wc_ascii_decor decorator generator object.
  */
 #ifdef BOOST_LOG_USE_CHAR
-const aux::c_ascii_decorator_gen< char > c_ascii_decor = {};
+BOOST_INLINE_VARIABLE const aux::c_ascii_decorator_gen< char > c_ascii_decor = {};
 #endif
 #ifdef BOOST_LOG_USE_WCHAR_T
-const aux::c_ascii_decorator_gen< wchar_t > wc_ascii_decor = {};
+BOOST_INLINE_VARIABLE const aux::c_ascii_decorator_gen< wchar_t > wc_ascii_decor = {};
 #endif
 
 /*!

linx64/include/boost/log/expressions/formatters/csv_decorator.hpp

@@ -114,10 +114,10 @@ struct csv_decorator_gen
  * For wide-character formatting there is the similar \c wcsv_decor decorator generator object.
  */
 #ifdef BOOST_LOG_USE_CHAR
-const aux::csv_decorator_gen< char > csv_decor = {};
+BOOST_INLINE_VARIABLE const aux::csv_decorator_gen< char > csv_decor = {};
 #endif
 #ifdef BOOST_LOG_USE_WCHAR_T
-const aux::csv_decorator_gen< wchar_t > wcsv_decor = {};
+BOOST_INLINE_VARIABLE const aux::csv_decorator_gen< wchar_t > wcsv_decor = {};
 #endif
 
 /*!

linx64/include/boost/log/expressions/formatters/stream.hpp

@@ -37,7 +37,7 @@ typedef phoenix::expression::argument< 2 >::type stream_type;
 /*!
  * Stream placeholder in formatter template expressions.
  */
-const stream_type stream = {};
+BOOST_INLINE_VARIABLE const stream_type stream = {};
 
 } // namespace expressions
 

linx64/include/boost/log/expressions/formatters/xml_decorator.hpp

@@ -112,10 +112,10 @@ struct xml_decorator_gen
  * For wide-character formatting there is the similar \c wxml_decor decorator generator object.
  */
 #ifdef BOOST_LOG_USE_CHAR
-const aux::xml_decorator_gen< char > xml_decor = {};
+BOOST_INLINE_VARIABLE const aux::xml_decorator_gen< char > xml_decor = {};
 #endif
 #ifdef BOOST_LOG_USE_WCHAR_T
-const aux::xml_decorator_gen< wchar_t > wxml_decor = {};
+BOOST_INLINE_VARIABLE const aux::xml_decorator_gen< wchar_t > wxml_decor = {};
 #endif
 
 /*!