update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / test / impl / compiler_log_formatter.ipp

diff --git a/ceph/src/boost/boost/test/impl/compiler_log_formatter.ipp b/ceph/src/boost/boost/test/impl/compiler_log_formatter.ipp
index 1b2645ba12fe7f2c1c705e2dcba9ca592ee3d965..4c99a9338d8209b88b766762f1f1c297197b1b84 100644 (file)
--- a/ceph/src/boost/boost/test/impl/compiler_log_formatter.ipp
+++ b/ceph/src/boost/boost/test/impl/compiler_log_formatter.ipp
@@ -26,8 +26,6 @@
 
 #include <boost/test/utils/basic_cstring/io.hpp>
 #include <boost/test/utils/lazy_ostream.hpp>
-#include <boost/test/utils/setcolor.hpp>
-
 
 // Boost
 #include <boost/version.hpp>
@@ -184,25 +182,25 @@ compiler_log_formatter::log_entry_start( std::ostream& output, log_entry_data co
     switch( let ) {
         case BOOST_UTL_ET_INFO:
             print_prefix( output, entry_data.m_file_name, entry_data.m_line_num );
-            output << setcolor( m_color_output, term_attr::BRIGHT, term_color::GREEN );
+            output << setcolor( m_color_output, term_attr::BRIGHT, term_color::GREEN, term_color::ORIGINAL, &m_color_state);
             output << "info: ";
             break;
         case BOOST_UTL_ET_MESSAGE:
-            output << setcolor( m_color_output, term_attr::BRIGHT, term_color::CYAN );
+            output << setcolor( m_color_output, term_attr::BRIGHT, term_color::CYAN, term_color::ORIGINAL, &m_color_state);
             break;
         case BOOST_UTL_ET_WARNING:
             print_prefix( output, entry_data.m_file_name, entry_data.m_line_num );
-            output << setcolor( m_color_output, term_attr::BRIGHT, term_color::YELLOW );
+            output << setcolor( m_color_output, term_attr::BRIGHT, term_color::YELLOW, term_color::ORIGINAL, &m_color_state);
             output << "warning: in \"" << test_phase_identifier() << "\": ";
             break;
         case BOOST_UTL_ET_ERROR:
             print_prefix( output, entry_data.m_file_name, entry_data.m_line_num );
-            output << setcolor( m_color_output, term_attr::BRIGHT, term_color::RED );
+            output << setcolor( m_color_output, term_attr::BRIGHT, term_color::RED, term_color::ORIGINAL, &m_color_state);
             output << "error: in \"" << test_phase_identifier() << "\": ";
             break;
         case BOOST_UTL_ET_FATAL_ERROR:
             print_prefix( output, entry_data.m_file_name, entry_data.m_line_num );
-            output << setcolor( m_color_output, term_attr::UNDERLINE, term_color::RED );
+            output << setcolor( m_color_output, term_attr::UNDERLINE, term_color::RED, term_color::ORIGINAL, &m_color_state);
             output << "fatal error: in \"" << test_phase_identifier() << "\": ";
             break;
     }
@@ -230,7 +228,7 @@ void
 compiler_log_formatter::log_entry_finish( std::ostream& output )
 {
     if( m_color_output )
-        output << utils::setcolor(m_color_output);
+        output << utils::setcolor(m_color_output, &m_color_state);
 
     output << std::endl;
 }