update boost on linux
This commit is contained in:
@@ -544,14 +544,14 @@ public:
|
||||
friend typename aux::enable_if_streamable_char_type< OtherCharT, basic_formatting_ostream& >::type
|
||||
operator<< (basic_formatting_ostream& strm, std::basic_string< OtherCharT, OtherTraitsT, OtherAllocatorT > const& str)
|
||||
{
|
||||
return strm.formatted_write(str.c_str(), static_cast< std::streamsize >(str.size()));
|
||||
return strm.formatted_write(str.data(), static_cast< std::streamsize >(str.size()));
|
||||
}
|
||||
|
||||
template< typename OtherCharT, typename OtherTraitsT >
|
||||
friend typename aux::enable_if_streamable_char_type< OtherCharT, basic_formatting_ostream& >::type
|
||||
operator<< (basic_formatting_ostream& strm, basic_string_literal< OtherCharT, OtherTraitsT > const& str)
|
||||
{
|
||||
return strm.formatted_write(str.c_str(), static_cast< std::streamsize >(str.size()));
|
||||
return strm.formatted_write(str.data(), static_cast< std::streamsize >(str.size()));
|
||||
}
|
||||
|
||||
template< typename OtherCharT, typename OtherTraitsT >
|
||||
@@ -573,14 +573,14 @@ public:
|
||||
friend typename aux::enable_if_streamable_char_type< OtherCharT, basic_formatting_ostream& >::type
|
||||
operator<< (basic_formatting_ostream& strm, std::basic_string< OtherCharT, OtherTraitsT, OtherAllocatorT >& str)
|
||||
{
|
||||
return strm.formatted_write(str.c_str(), static_cast< std::streamsize >(str.size()));
|
||||
return strm.formatted_write(str.data(), static_cast< std::streamsize >(str.size()));
|
||||
}
|
||||
|
||||
template< typename OtherCharT, typename OtherTraitsT >
|
||||
friend typename aux::enable_if_streamable_char_type< OtherCharT, basic_formatting_ostream& >::type
|
||||
operator<< (basic_formatting_ostream& strm, basic_string_literal< OtherCharT, OtherTraitsT >& str)
|
||||
{
|
||||
return strm.formatted_write(str.c_str(), static_cast< std::streamsize >(str.size()));
|
||||
return strm.formatted_write(str.data(), static_cast< std::streamsize >(str.size()));
|
||||
}
|
||||
|
||||
template< typename OtherCharT, typename OtherTraitsT >
|
||||
@@ -603,14 +603,14 @@ public:
|
||||
friend typename aux::enable_if_streamable_char_type< OtherCharT, basic_formatting_ostream& >::type
|
||||
operator<< (basic_formatting_ostream&& strm, std::basic_string< OtherCharT, OtherTraitsT, OtherAllocatorT > const& str)
|
||||
{
|
||||
return strm.formatted_write(str.c_str(), static_cast< std::streamsize >(str.size()));
|
||||
return strm.formatted_write(str.data(), static_cast< std::streamsize >(str.size()));
|
||||
}
|
||||
|
||||
template< typename OtherCharT, typename OtherTraitsT >
|
||||
friend typename aux::enable_if_streamable_char_type< OtherCharT, basic_formatting_ostream& >::type
|
||||
operator<< (basic_formatting_ostream&& strm, basic_string_literal< OtherCharT, OtherTraitsT > const& str)
|
||||
{
|
||||
return strm.formatted_write(str.c_str(), static_cast< std::streamsize >(str.size()));
|
||||
return strm.formatted_write(str.data(), static_cast< std::streamsize >(str.size()));
|
||||
}
|
||||
|
||||
template< typename OtherCharT, typename OtherTraitsT >
|
||||
@@ -632,14 +632,14 @@ public:
|
||||
friend typename aux::enable_if_streamable_char_type< OtherCharT, basic_formatting_ostream& >::type
|
||||
operator<< (basic_formatting_ostream&& strm, std::basic_string< OtherCharT, OtherTraitsT, OtherAllocatorT >& str)
|
||||
{
|
||||
return strm.formatted_write(str.c_str(), static_cast< std::streamsize >(str.size()));
|
||||
return strm.formatted_write(str.data(), static_cast< std::streamsize >(str.size()));
|
||||
}
|
||||
|
||||
template< typename OtherCharT, typename OtherTraitsT >
|
||||
friend typename aux::enable_if_streamable_char_type< OtherCharT, basic_formatting_ostream& >::type
|
||||
operator<< (basic_formatting_ostream&& strm, basic_string_literal< OtherCharT, OtherTraitsT >& str)
|
||||
{
|
||||
return strm.formatted_write(str.c_str(), static_cast< std::streamsize >(str.size()));
|
||||
return strm.formatted_write(str.data(), static_cast< std::streamsize >(str.size()));
|
||||
}
|
||||
|
||||
template< typename OtherCharT, typename OtherTraitsT >
|
||||
|
||||
@@ -429,7 +429,7 @@ public:
|
||||
|
||||
/*!
|
||||
* The method wakes up all threads that are blocked in calls to <tt>send()</tt> or
|
||||
* <tt>receive()</tt>. Those calls would then return \c false with \c errno \c EINTR.
|
||||
* <tt>receive()</tt>. Those calls would then return <tt>operation_result::aborted</tt>.
|
||||
* Note that, the method does not block until the woken-up threads have actually
|
||||
* returned from <tt>send()</tt> or <tt>receive()</tt>. Other means is needed to ensure
|
||||
* that calls to <tt>send()</tt> or <tt>receive()</tt> have returned, e.g., joining the
|
||||
@@ -437,7 +437,7 @@ public:
|
||||
*
|
||||
* The method also puts the object in stopped state. When in stopped state, calls to
|
||||
* <tt>send()</tt> or <tt>receive()</tt> will return immediately with return value
|
||||
* \c false and \c errno \c EINTR when they would otherwise block in running state.
|
||||
* <tt>operation_result::aborted</tt> when they would otherwise block in running state.
|
||||
*
|
||||
* Concurrent calls to this method, <tt>send()</tt>, <tt>try_send()</tt>, <tt>receive()</tt>,
|
||||
* <tt>try_receive()</tt>, and <tt>clear()</tt> are allowed.
|
||||
|
||||
@@ -33,11 +33,9 @@ struct _SECURITY_ATTRIBUTES;
|
||||
namespace boost {
|
||||
|
||||
#ifdef BOOST_WINDOWS
|
||||
namespace detail {
|
||||
namespace winapi {
|
||||
struct BOOST_LOG_MAY_ALIAS _SECURITY_ATTRIBUTES;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace interprocess {
|
||||
@@ -108,7 +106,7 @@ public:
|
||||
}
|
||||
|
||||
#ifdef BOOST_WINDOWS
|
||||
permissions(boost::detail::winapi::_SECURITY_ATTRIBUTES* perms) BOOST_NOEXCEPT : m_perms(reinterpret_cast< native_type >(perms))
|
||||
permissions(boost::winapi::_SECURITY_ATTRIBUTES* perms) BOOST_NOEXCEPT : m_perms(reinterpret_cast< native_type >(perms))
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -15,9 +15,11 @@
|
||||
#ifndef BOOST_LOG_UTILITY_SETUP_FILE_HPP_INCLUDED_
|
||||
#define BOOST_LOG_UTILITY_SETUP_FILE_HPP_INCLUDED_
|
||||
|
||||
#include <boost/type_traits/is_void.hpp>
|
||||
#include <boost/smart_ptr/shared_ptr.hpp>
|
||||
#include <boost/smart_ptr/make_shared_object.hpp>
|
||||
#include <boost/parameter/parameters.hpp> // for is_named_argument
|
||||
#include <boost/preprocessor/control/expr_if.hpp>
|
||||
#include <boost/preprocessor/comparison/greater.hpp>
|
||||
#include <boost/preprocessor/punctuation/comma_if.hpp>
|
||||
#include <boost/preprocessor/repetition/enum_params.hpp>
|
||||
@@ -96,18 +98,36 @@ shared_ptr< BOOST_LOG_FILE_SINK_FRONTEND_INTERNAL< sinks::text_file_backend > >
|
||||
return pSink;
|
||||
}
|
||||
|
||||
//! The function wraps the argument into a file_name named argument, if needed
|
||||
template< typename T >
|
||||
inline T const& wrap_file_name(T const& arg, mpl::true_)
|
||||
//! The trait wraps the argument into a file_name named argument, if needed
|
||||
template< typename T, bool IsNamedArgument = parameter::aux::is_named_argument< T >::value >
|
||||
struct file_name_param_traits
|
||||
{
|
||||
return arg;
|
||||
}
|
||||
static shared_ptr< BOOST_LOG_FILE_SINK_FRONTEND_INTERNAL< sinks::text_file_backend > > wrap_add_file_log(T const& file_name_arg)
|
||||
{
|
||||
return aux::add_file_log(file_name_arg);
|
||||
}
|
||||
|
||||
template< typename ArgsT >
|
||||
static shared_ptr< BOOST_LOG_FILE_SINK_FRONTEND_INTERNAL< sinks::text_file_backend > > wrap_add_file_log(T const& file_name_arg, ArgsT const& args)
|
||||
{
|
||||
return aux::add_file_log((args, file_name_arg));
|
||||
}
|
||||
};
|
||||
|
||||
template< typename T >
|
||||
inline typename parameter::aux::tag< keywords::tag::file_name, T const >::type
|
||||
wrap_file_name(T const& arg, mpl::false_)
|
||||
struct file_name_param_traits< T, false >
|
||||
{
|
||||
return keywords::file_name = arg;
|
||||
}
|
||||
static shared_ptr< BOOST_LOG_FILE_SINK_FRONTEND_INTERNAL< sinks::text_file_backend > > wrap_add_file_log(T const& file_name_arg)
|
||||
{
|
||||
return aux::add_file_log(keywords::file_name = file_name_arg);
|
||||
}
|
||||
|
||||
template< typename ArgsT >
|
||||
static shared_ptr< BOOST_LOG_FILE_SINK_FRONTEND_INTERNAL< sinks::text_file_backend > > wrap_add_file_log(T const& file_name_arg, ArgsT const& args)
|
||||
{
|
||||
return aux::add_file_log((args, (keywords::file_name = file_name_arg)));
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace aux
|
||||
|
||||
@@ -117,11 +137,11 @@ wrap_file_name(T const& arg, mpl::false_)
|
||||
template< BOOST_PP_ENUM_PARAMS(n, typename T) >\
|
||||
inline shared_ptr< BOOST_LOG_FILE_SINK_FRONTEND_INTERNAL< sinks::text_file_backend > > add_file_log(BOOST_PP_ENUM_BINARY_PARAMS(n, T, const& arg))\
|
||||
{\
|
||||
return aux::add_file_log((\
|
||||
aux::wrap_file_name(arg0, typename parameter::aux::is_named_argument< T0 >::type())\
|
||||
return aux::file_name_param_traits< T0 >::wrap_add_file_log(\
|
||||
arg0\
|
||||
BOOST_PP_COMMA_IF(BOOST_PP_GREATER(n, 1))\
|
||||
BOOST_PP_ENUM_SHIFTED_PARAMS(n, arg)\
|
||||
));\
|
||||
BOOST_PP_EXPR_IF(BOOST_PP_GREATER(n, 1), (BOOST_PP_ENUM_SHIFTED_PARAMS(n, arg)))\
|
||||
);\
|
||||
}
|
||||
|
||||
BOOST_PP_REPEAT_FROM_TO(1, BOOST_LOG_MAX_PARAMETER_ARGS, BOOST_LOG_INIT_LOG_TO_FILE_INTERNAL, ~)
|
||||
@@ -134,7 +154,11 @@ BOOST_PP_REPEAT_FROM_TO(1, BOOST_LOG_MAX_PARAMETER_ARGS, BOOST_LOG_INIT_LOG_TO_F
|
||||
* The function initializes the logging library to write logs to a file stream.
|
||||
*
|
||||
* \param args A number of named arguments. The following parameters are supported:
|
||||
* \li \c file_name The file name or its pattern. This parameter is mandatory.
|
||||
* \li \c file_name The active file name or its pattern. This parameter is mandatory.
|
||||
* \li \c target_file_name - Specifies the target file name pattern to use to rename the log file on rotation,
|
||||
* before passing it to the file collector. The pattern may contain the same
|
||||
* placeholders as the \c file_name parameter. By default, no renaming is done,
|
||||
* i.e. the written log file keeps its name according to \c file_name.
|
||||
* \li \c open_mode The mask that describes the open mode for the file. See <tt>std::ios_base::openmode</tt>.
|
||||
* \li \c rotation_size The size of the file at which rotation should occur. See <tt>basic_text_file_backend</tt>.
|
||||
* \li \c time_based_rotation The predicate for time-based file rotations. See <tt>basic_text_file_backend</tt>.
|
||||
|
||||
@@ -24,9 +24,9 @@
|
||||
#include <boost/iterator/iterator_adaptor.hpp>
|
||||
#include <boost/optional/optional.hpp>
|
||||
#include <boost/property_tree/ptree.hpp>
|
||||
#include <boost/core/explicit_operator_bool.hpp>
|
||||
#include <boost/log/detail/setup_config.hpp>
|
||||
#include <boost/log/detail/native_typeof.hpp>
|
||||
#include <boost/utility/explicit_operator_bool.hpp>
|
||||
#if !defined(BOOST_LOG_TYPEOF)
|
||||
#include <boost/core/enable_if.hpp>
|
||||
#endif
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
|
||||
#include <boost/type_index.hpp>
|
||||
#include <boost/static_assert.hpp>
|
||||
#include <boost/core/explicit_operator_bool.hpp>
|
||||
#include <boost/log/detail/config.hpp>
|
||||
#include <boost/utility/explicit_operator_bool.hpp>
|
||||
#include <boost/log/detail/header.hpp>
|
||||
|
||||
#ifdef BOOST_HAS_PRAGMA_ONCE
|
||||
|
||||
Reference in New Issue
Block a user