From ee9783367a1e933b9af49a89a4fb8e0a027bcf5d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 5 Nov 2019 07:57:50 +0200
Subject: Fix function call diagnostics to use diag_frame

---
 libbuild2/function.cxx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'libbuild2/function.cxx')

diff --git a/libbuild2/function.cxx b/libbuild2/function.cxx
index f790809..6fa9709 100644
--- a/libbuild2/function.cxx
+++ b/libbuild2/function.cxx
@@ -207,16 +207,15 @@ namespace build2
       {
         // Print the call location in case the function fails.
         //
-        auto g (
-          make_exception_guard (
-            [fa, &loc, &print_call] ()
+        auto df = make_diag_frame (
+          [fa, &loc, &print_call] (const diag_record& dr)
+          {
+            if (fa)
             {
-              if (fa && verb != 0)
-              {
-                diag_record dr (info (loc));
-                dr << "while calling "; print_call (dr.os);
-              }
-            }));
+              dr << info (loc) << "while calling ";
+              print_call (dr.os);
+            }
+          });
 
         auto f (ovls.back ());
 
-- 
cgit v1.1