From 99c1d1f247343b884af0b51389311484ed265d3b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 27 Jul 2020 11:05:08 +0200 Subject: [PATCH] Fix some unused variable warnings on macOS. --- src/lib/cross_osx.cc | 4 ++-- src/tools/dcpomatic_disk.cc | 3 +++ src/tools/dcpomatic_disk_writer.cc | 2 +- wscript | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index aa05df016..e91d3df16 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -245,7 +245,7 @@ home_directory () } string -command_and_read (string cmd) +command_and_read (string) { return ""; } @@ -515,7 +515,7 @@ config_path () } -void done_callback(DADiskRef disk, DADissenterRef dissenter, void* context) +void done_callback(DADiskRef, DADissenterRef dissenter, void* context) { LOG_DISK_NC("Unmount finished"); bool* success = reinterpret_cast (context); diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index 55f2bd440..b94d4bf94 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -35,8 +35,11 @@ #include "lib/job_manager.h" #include "lib/disk_writer_messages.h" #include "lib/version.h" +#include "lib/warnings.h" #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #ifdef DCPOMATIC_WINDOWS #include #endif diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc index 1e6d10fbf..2c3753e57 100644 --- a/src/tools/dcpomatic_disk_writer.cc +++ b/src/tools/dcpomatic_disk_writer.cc @@ -569,7 +569,7 @@ main () /* I *think* this confumes the notifyd event that we used to start the process, so we only * get started once per notification. */ - xpc_set_event_stream_handler("com.apple.notifyd.matching", DISPATCH_TARGET_QUEUE_DEFAULT, ^(xpc_object_t event) {}); + xpc_set_event_stream_handler("com.apple.notifyd.matching", DISPATCH_TARGET_QUEUE_DEFAULT, ^(xpc_object_t) {}); #endif try { diff --git a/wscript b/wscript index b9e7d6a64..a333f95d8 100644 --- a/wscript +++ b/wscript @@ -549,6 +549,7 @@ def configure(conf): #include \n int main() { new boost::process::child("foo"); }\n """, + cxxflags='-Wno-unused-parameter', msg='Checking for boost process library', lib=deps, uselib_store='BOOST_PROCESS') -- 2.30.2