From 31b2667ba5ac3dd77f7d93560e3441eb60f362d6 Mon Sep 17 00:00:00 2001
From: Vojtech Bubnik <bubnikv@gmail.com>
Date: Wed, 10 Feb 2021 18:26:29 +0100
Subject: [PATCH] Trying to fix the remaining OSX warnings

---
 src/libslic3r/AABBTreeIndirect.hpp     | 4 ++--
 src/libslic3r/Fill/FillRectilinear.cpp | 7 ++++++-
 src/slic3r/GUI/FirmwareDialog.cpp      | 7 ++++++-
 src/slic3r/Utils/MacDarkMode.mm        | 3 +++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/libslic3r/AABBTreeIndirect.hpp b/src/libslic3r/AABBTreeIndirect.hpp
index 70096b557b..b11c570f66 100644
--- a/src/libslic3r/AABBTreeIndirect.hpp
+++ b/src/libslic3r/AABBTreeIndirect.hpp
@@ -653,8 +653,8 @@ inline bool intersect_ray_all_hits(
 	std::vector<igl::Hit> 				&hits)
 {
     auto ray_intersector = detail::RayIntersectorHits<VertexType, IndexedFaceType, TreeType, VectorType> {
-        vertices, faces, {tree},
-        origin, dir, VectorType(dir.cwiseInverse())
+        { vertices, faces, {tree},
+        origin, dir, VectorType(dir.cwiseInverse()) }
 	};
 	if (! tree.empty()) {
         ray_intersector.hits.reserve(8);
diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp
index 97cd7ca000..07f41de383 100644
--- a/src/libslic3r/Fill/FillRectilinear.cpp
+++ b/src/libslic3r/Fill/FillRectilinear.cpp
@@ -2332,7 +2332,12 @@ static std::vector<MonotonicRegionLink> chain_monotonic_regions(
     }
 
     // Probability (unnormalized) of traversing a link between two monotonic regions.
-	auto path_probability = [pheromone_alpha, pheromone_beta](AntPath &path) {
+	auto path_probability = [
+#ifndef __APPLE__
+        // clang complains when capturing constexpr constants.
+        pheromone_alpha, pheromone_beta
+#endif // __APPLE__
+        ](AntPath &path) {
 		return pow(path.pheromone, pheromone_alpha) * pow(path.visibility, pheromone_beta);
 	};
 
diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp
index 7a67c0c731..15f0551328 100644
--- a/src/slic3r/GUI/FirmwareDialog.cpp
+++ b/src/slic3r/GUI/FirmwareDialog.cpp
@@ -648,7 +648,12 @@ void FirmwareDialog::priv::perform_upload()
 				}
 			}
 		})
-		.on_message([extra_verbose, q](const char* msg, unsigned /* size */) {
+		.on_message([
+#ifndef __APPLE__
+	        // clang complains when capturing constants.
+			extra_verbose,
+#endif // __APPLE__
+			q](const char* msg, unsigned /* size */) {
 			if (extra_verbose) {
 				BOOST_LOG_TRIVIAL(debug) << "avrdude: " << msg;
 			}
diff --git a/src/slic3r/Utils/MacDarkMode.mm b/src/slic3r/Utils/MacDarkMode.mm
index adbd72aabd..512e96b94d 100644
--- a/src/slic3r/Utils/MacDarkMode.mm
+++ b/src/slic3r/Utils/MacDarkMode.mm
@@ -2,9 +2,12 @@
 
 #import <algorithm>
 
+#import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
 #import <AppKit/NSScreen.h>
 
+@interface MacDarkMode : NSObject {}
+@end
 
 @implementation MacDarkMode