minor changes in diagnostic_info, plus re-enabled all unit tests

boostorg · Dec 10, 2023 · 95fff4a · 95fff4a
1 parent 31bc165
commit 95fff4a
Show file tree

Hide file tree

Showing 26 changed files with 368 additions and 353 deletions.
diff --git a/include/boost/leaf/config.hpp b/include/boost/leaf/config.hpp
@@ -102,10 +102,6 @@
 #   error BOOST_LEAF_CFG_CAPTURE must be 0 or 1.
 #endif
 
-#if BOOST_LEAF_CFG_DIAGNOSTICS && !BOOST_LEAF_CFG_STD_STRING
-#   error BOOST_LEAF_CFG_DIAGNOSTICS requires the use of std::string
-#endif
-
 #if BOOST_LEAF_CFG_WIN32!=0 && BOOST_LEAF_CFG_WIN32!=1
 #   error BOOST_LEAF_CFG_WIN32 must be 0 or 1.
 #endif
@@ -114,8 +110,12 @@
 #   error BOOST_LEAF_CFG_GNUC_STMTEXPR must be 0 or 1.
 #endif
 
+#if BOOST_LEAF_CFG_DIAGNOSTICS && !BOOST_LEAF_CFG_STD_STRING
+#   error BOOST_LEAF_CFG_DIAGNOSTICS requires BOOST_LEAF_CFG_STD_STRING, which has been disabled.
+#endif
+
 #if BOOST_LEAF_CFG_STD_SYSTEM_ERROR && !BOOST_LEAF_CFG_STD_STRING
-#   error BOOST_LEAF_CFG_STD_SYSTEM_ERROR != 0 requires BOOST_LEAF_CFG_STD_STRING != 0
+#   error BOOST_LEAF_CFG_STD_SYSTEM_ERROR requires BOOST_LEAF_CFG_STD_STRING, which has been disabled.
 #endif
 
 ////////////////////////////////////////

diff --git a/include/boost/leaf/context.hpp b/include/boost/leaf/context.hpp
@@ -17,9 +17,7 @@ namespace boost { namespace leaf {
 
 class error_info;
 class diagnostic_info;
-#if BOOST_LEAF_CFG_DIAGNOSTICS
 class verbose_diagnostic_info;
-#endif
 
 template <class>
 struct is_predicate: std::false_type
@@ -60,9 +58,7 @@ namespace leaf_detail
         static_assert(!is_predicate<error_type>::value, "Handlers must take predicate arguments by value");
         static_assert(!std::is_same<E, error_info>::value, "Handlers must take leaf::error_info arguments by const &");
         static_assert(!std::is_same<E, diagnostic_info>::value, "Handlers must take leaf::diagnostic_info arguments by const &");
-#if BOOST_LEAF_CFG_DIAGNOSTICS
         static_assert(!std::is_same<E, verbose_diagnostic_info>::value, "Handlers must take leaf::verbose_diagnostic_info arguments by const &");
-#endif
     };
 
     template <class Pred>

diff --git a/include/boost/leaf/error.hpp b/include/boost/leaf/error.hpp
@@ -189,7 +189,6 @@ namespace leaf_detail
         template <class CharT, class Traits>
         void print( std::basic_ostream<CharT, Traits> & os, int err_id_to_print ) const
         {
-#if BOOST_LEAF_CFG_DIAGNOSTICS
             if( !diagnostic<E>::is_invisible )
                 if( int k = this->key() )
                 {
@@ -201,12 +200,7 @@ namespace leaf_detail
                     else
                         os << '[' << k << "] ";
                     diagnostic<E>::print(os, value(k));
-                    (os << '\n').flush();
                 }
-#else
-            (void) os;
-            (void) err_id_to_print;
-#endif
         }
 
         using impl::load;
@@ -400,6 +394,17 @@ namespace leaf_detail
         using capture_list::print;
     };
 
+    template <>
+    struct diagnostic<dynamic_allocator, false, false, false>
+    {
+        static constexpr bool is_invisible = true;
+
+        template <class CharT, class Traits>
+        BOOST_LEAF_CONSTEXPR static void print( std::basic_ostream<CharT, Traits> &, dynamic_allocator const & )
+        {
+        }
+    };
+
     template <>
     inline void slot<dynamic_allocator>::deactivate() const noexcept
     {