From 49e65989679facd98c777ac7a945bc9aab82d771 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Mon, 15 Aug 2022 16:33:44 +0200 Subject: [PATCH 1/2] examples/member_method: Make on_print() non-virtual so it can be compiled with the -Wnon-virtual-dtor compiler option. --- examples/member_method.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/member_method.cc b/examples/member_method.cc index ab825258..5fc5b2cf 100644 --- a/examples/member_method.cc +++ b/examples/member_method.cc @@ -15,7 +15,7 @@ class Something : public sigc::trackable Something(); protected: - virtual void on_print(int a); + void on_print(int a); using type_signal_print = sigc::signal; type_signal_print signal_print; @@ -35,7 +35,7 @@ Something::Something() void Something::on_print(int a) { - std::cout << "on_print recieved: " << a << std::endl; + std::cout << "on_print received: " << a << std::endl; } int From 64ae95c54006c586800039614d74b2f0e2f78259 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Mon, 15 Aug 2022 16:34:25 +0200 Subject: [PATCH 2/2] Fix build with -Dbuild-deprecated-api=false Fixes #82 --- examples/meson.build | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/meson.build b/examples/meson.build index c55bfdd8..3c575aec 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -20,7 +20,7 @@ foreach ex : examples endforeach exe_file = executable(ex_name, ex_sources, - cpp_args: '-DSIGCXX_DISABLE_DEPRECATED', + cpp_args: '-DSIGCXX_DISABLE_DEPRECATED=1', dependencies: sigcxx_own_dep, implicit_include_directories: false, build_by_default: build_examples diff --git a/meson.build b/meson.build index ca49138e..b20016b0 100644 --- a/meson.build +++ b/meson.build @@ -206,7 +206,7 @@ pkg_conf_data.set('PACKAGE_VERSION', meson.project_version()) pkg_conf_data.set('SIGCXX_API_VERSION', sigcxx_api_version) if not build_deprecated_api - pkg_conf_data.set('SIGCXX_DISABLE_DEPRECATED', true) + pkg_conf_data.set('SIGCXX_DISABLE_DEPRECATED', 1) endif pkg_conf_data.set('SIGCXX_MAJOR_VERSION', sigcxx_major_version) pkg_conf_data.set('SIGCXX_MINOR_VERSION', sigcxx_minor_version)