Merge branch 'master' of https://github.com/zajo/leaf

Author: zajo

include/boost/leaf/all.hpp

@@ -10487,10 +10487,16 @@ namespace boost { namespace leaf {
 
 		friend std::ostream & operator<<( std::ostream & os, diagnostic_info const & x )
 		{
-			os << "leaf::diagnostic_info:" << std::endl;
-			x.print(os);
-			if( x.e_uc_  )
-				x.e_uc_->print(os);
+			os << "leaf::diagnostic_info:";
+			if( x.err_id_ )
+			{
+				os << std::endl;
+				x.print(os);
+				if( x.e_uc_  )
+					x.e_uc_->print(os);
+			}
+			else
+				os << " {No Error}" << std::endl;
 			return os;
 		}
 	};
@@ -10509,10 +10515,16 @@ namespace boost { namespace leaf {
 
 		friend std::ostream & operator<<( std::ostream & os, verbose_diagnostic_info const & x )
 		{
-			os << "leaf::verbose_diagnostic_info:" << std::endl;
-			x.print(os);
-			if( x.e_ui_ )
-				x.e_ui_->print(os);
+			os << "leaf::verbose_diagnostic_info:";
+			if( x.err_id_ )
+			{
+				os << std::endl;
+				x.print(os);
+				if( x.e_ui_ )
+					x.e_ui_->print(os);
+			}
+			else
+				os << " {No Error}" << std::endl;
 			return os;
 		}
 	};
@@ -16524,10 +16536,16 @@ namespace boost { namespace leaf {
 
 		friend std::ostream & operator<<( std::ostream & os, diagnostic_info const & x )
 		{
-			os << "leaf::diagnostic_info:" << std::endl;
-			x.print(os);
-			if( x.e_uc_  )
-				x.e_uc_->print(os);
+			os << "leaf::diagnostic_info:";
+			if( x.err_id_ )
+			{
+				os << std::endl;
+				x.print(os);
+				if( x.e_uc_  )
+					x.e_uc_->print(os);
+			}
+			else
+				os << " {No Error}" << std::endl;
 			return os;
 		}
 	};
@@ -16546,10 +16564,16 @@ namespace boost { namespace leaf {
 
 		friend std::ostream & operator<<( std::ostream & os, verbose_diagnostic_info const & x )
 		{
-			os << "leaf::verbose_diagnostic_info:" << std::endl;
-			x.print(os);
-			if( x.e_ui_ )
-				x.e_ui_->print(os);
+			os << "leaf::verbose_diagnostic_info:";
+			if( x.err_id_ )
+			{
+				os << std::endl;
+				x.print(os);
+				if( x.e_ui_ )
+					x.e_ui_->print(os);
+			}
+			else
+				os << " {No Error}" << std::endl;
 			return os;
 		}
 	};

include/boost/leaf/detail/handle.hpp

@@ -127,10 +127,16 @@ namespace boost { namespace leaf {
 
 		friend std::ostream & operator<<( std::ostream & os, diagnostic_info const & x )
 		{
-			os << "leaf::diagnostic_info:" << std::endl;
-			x.print(os);
-			if( x.e_uc_  )
-				x.e_uc_->print(os);
+			os << "leaf::diagnostic_info:";
+			if( x.err_id_ )
+			{
+				os << std::endl;
+				x.print(os);
+				if( x.e_uc_  )
+					x.e_uc_->print(os);
+			}
+			else
+				os << " {No Error}" << std::endl;
 			return os;
 		}
 	};
@@ -149,10 +155,16 @@ namespace boost { namespace leaf {
 
 		friend std::ostream & operator<<( std::ostream & os, verbose_diagnostic_info const & x )
 		{
-			os << "leaf::verbose_diagnostic_info:" << std::endl;
-			x.print(os);
-			if( x.e_ui_ )
-				x.e_ui_->print(os);
+			os << "leaf::verbose_diagnostic_info:";
+			if( x.err_id_ )
+			{
+				os << std::endl;
+				x.print(os);
+				if( x.e_ui_ )
+					x.e_ui_->print(os);
+			}
+			else
+				os << " {No Error}" << std::endl;
 			return os;
 		}
 	};