Fix some unused variable warnings on macOS.

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index aa05df01688b4ab9c49314a661d5e26feec8fa2a..e91d3df16c4a6e982bcd871aee39d3b2de77ed1e 100644 (file)
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -245,7 +245,7 @@ home_directory ()
 }
 
 string
 }
 
 string

-command_and_read (string cmd)
+command_and_read (string)

 {
        return "";
 }
 {
        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<bool*> (context);
 {
        LOG_DISK_NC("Unmount finished");
        bool* success = reinterpret_cast<bool*> (context);

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 55f2bd4401a0461aa4ba874efc3ee7ecd2784ad3..b94d4bf941016c4deb5e898040c7e50995c88fe5 100644 (file)
--- 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/job_manager.h"
 #include "lib/disk_writer_messages.h"
 #include "lib/version.h"

+#include "lib/warnings.h"

 #include <wx/wx.h>
 #include <wx/wx.h>

+DCPOMATIC_DISABLE_WARNINGS

 #include <boost/process.hpp>
 #include <boost/process.hpp>

+DCPOMATIC_ENABLE_WARNINGS

 #ifdef DCPOMATIC_WINDOWS
 #include <boost/process/windows.hpp>
 #endif
 #ifdef DCPOMATIC_WINDOWS
 #include <boost/process/windows.hpp>
 #endif

diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index 1e6d10fbf24af275eb5d2db0269ef9f5d93f8ae7..2c3753e57e9c318bae90ee9670859294cee1483c 100644 (file)
--- 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.
         */
        /* 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 {
 #endif
 
        try {

diff --git a/wscript b/wscript
index b9e7d6a640278e4ff0b120e9dd1e9b3d5f42d8b8..a333f95d891255d268d841487669813502a64c2a 100644 (file)
--- a/wscript
+++ b/wscript
@@ -549,6 +549,7 @@ def configure(conf):
                                 #include <boost/process.hpp>\n
                                 int main() { new boost::process::child("foo"); }\n
                                 """,
                                 #include <boost/process.hpp>\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')
                            msg='Checking for boost process library',
                            lib=deps,
                            uselib_store='BOOST_PROCESS')