diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2019-10-10 18:57:08 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-10-10 18:57:08 +0000 |
| commit | a5a158b4d78feabca56b27313c017160b9851cb7 (patch) | |
| tree | c7a23eacdd2204717140782064a4672479baebc0 | |
| parent | 458987d4184fc6e5995b91980b5ea79c83cb86b3 (diff) | |
| download | mongo-a5a158b4d78feabca56b27313c017160b9851cb7.tar.gz | |
Revert "SERVER-41899 Support multiple instances of boost::log::core"
This reverts commit ea6c7f08de9e406c8dc05408f1ed688220e03954.
3 files changed, 0 insertions, 24 deletions
diff --git a/src/third_party/boost-1.70.0/boost/log/core/core.hpp b/src/third_party/boost-1.70.0/boost/log/core/core.hpp index 4c382cadb17..84ad1ef3e17 100644 --- a/src/third_party/boost-1.70.0/boost/log/core/core.hpp +++ b/src/third_party/boost-1.70.0/boost/log/core/core.hpp @@ -90,12 +90,6 @@ public: BOOST_LOG_API static core_ptr get(); /*! - * \return The method returns a pointer to a new logging core instance. - * MONGODB MODIFICATION - */ - BOOST_LOG_API static core_ptr create(); - - /*! * The method enables or disables logging. * * Setting this status to \c false allows you to completely wipe out any logging activity, including diff --git a/src/third_party/boost-1.70.0/boost/log/sources/basic_logger.hpp b/src/third_party/boost-1.70.0/boost/log/sources/basic_logger.hpp index b0ead14b4e2..58bd6594c56 100644 --- a/src/third_party/boost-1.70.0/boost/log/sources/basic_logger.hpp +++ b/src/third_party/boost-1.70.0/boost/log/sources/basic_logger.hpp @@ -135,17 +135,6 @@ public: m_pCore(core::get()) { } - - /*! - * Constructor. Initializes internal data structures of the basic logger class, - * acquires reference to the provided logging core. - */ - basic_logger(core_ptr c) : - threading_model(), - m_pCore(boost::move(c)) - { - } - /*! * Copy constructor. Copies all attributes from the source logger. * diff --git a/src/third_party/boost-1.70.0/libs/log/src/core.cpp b/src/third_party/boost-1.70.0/libs/log/src/core.cpp index 5425367d9a3..07f719962c6 100644 --- a/src/third_party/boost-1.70.0/libs/log/src/core.cpp +++ b/src/third_party/boost-1.70.0/libs/log/src/core.cpp @@ -489,13 +489,6 @@ BOOST_LOG_API core_ptr core::get() return implementation::get(); } -//! The method returns a new pointer to a logging system instance -//! MONGODB MODIFICATION -BOOST_LOG_API core_ptr core::create() -{ - return core_ptr(new core()); -} - //! The method enables or disables logging and returns the previous state of logging flag BOOST_LOG_API bool core::set_logging_enabled(bool enabled) { |