From 460eb164f0051cf0ffab6860220649c4f03c74fb Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 15 Nov 2019 13:27:23 +0300 Subject: Use path_name_view in location and path_name_value in location_value --- libbuild2/version/init.cxx | 6 +++--- libbuild2/version/utility.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libbuild2/version') diff --git a/libbuild2/version/init.cxx b/libbuild2/version/init.cxx index c9d5021..9a56756 100644 --- a/libbuild2/version/init.cxx +++ b/libbuild2/version/init.cxx @@ -74,8 +74,8 @@ namespace build2 if (nv.value != pn.string ()) { path bf (rs.src_path () / rs.root_extra->bootstrap_file); - location ml (&f, nv.value_line, nv.value_column); - location bl (&bf); + location ml (f, nv.value_line, nv.value_column); + location bl (bf); fail (ml) << "package name " << nv.value << " does not match " << "build system project name " << pn << @@ -164,7 +164,7 @@ namespace build2 } catch (const manifest_parsing& e) { - location l (&f, e.line, e.column); + location l (f, e.line, e.column); fail (l) << e.description; } catch (const io_error& e) diff --git a/libbuild2/version/utility.cxx b/libbuild2/version/utility.cxx index 0669da7..867aaa8 100644 --- a/libbuild2/version/utility.cxx +++ b/libbuild2/version/utility.cxx @@ -63,12 +63,12 @@ namespace build2 } catch (const manifest_parsing& e) { - location l (&in, e.line, e.column); + location l (in, e.line, e.column); fail (l) << e.description; } catch (const manifest_serialization& e) { - location l (&r.path); + location l (r.path); fail (l) << e.description; } catch (const io_error& e) -- cgit v1.1