From a8420ae8e2792f305c12840485c74899000ce4e4 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sat, 3 Oct 2020 18:39:10 +0300
Subject: Fix deprecated warning in meson.build

Fix warnings in libconfiguration
---
 lib/configuration/configuration.cpp | 4 ++--
 meson.build                         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/configuration/configuration.cpp b/lib/configuration/configuration.cpp
index 6686520..6e479f4 100644
--- a/lib/configuration/configuration.cpp
+++ b/lib/configuration/configuration.cpp
@@ -93,7 +93,7 @@ inline auto parse(const std::string &line, std::string &section)
 extern "C" int LLVMFuzzerTestOneInput(const char *Data, long long Size)
 {
     std::string section;
-    parse(std::string(Data, Size), section);
+    parse(std::string(Data, static_cast<unsigned long>(Size)), section);
     return 0;
 }
 #endif
@@ -146,7 +146,7 @@ Configuration *Configuration::instance()
     return s_conf;
 }
 
-std::ostream &operator<<(std::ostream &out, const Configuration &obj)
+std::ostream &operator<<(std::ostream &out, const Configuration &obj param_typestate(unconsumed))
 {
     if(obj.use_global) {
         out << *s_conf;
diff --git a/meson.build b/meson.build
index df718cc..73963a8 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@ kconfig = import('unstable-keyval')
 cdata = configuration_data(kconfig.load(host_machine.system() + '/.config'))
 
 version_h = vcs_tag(
-    command: [find_program('git').path(), 'describe', '--long', '--abbrev=40'],
+    command: [find_program('git').full_path(), 'describe', '--long', '--abbrev=40'],
     #fallback: defaults to meson.project_version(),
     input: 'src/version.h.in',
     output: 'version.h'
@@ -30,6 +30,7 @@ endif
 sourceset = import('sourceset')
 
 cxx = meson.get_compiler('cpp')
+summary({'compiler': cxx.get_id()}, section: 'Compiler')
 
 # add some specific flags
 add_project_arguments(cxx.get_supported_arguments([
-- 
cgit v1.2.1