summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-12-23 14:09:28 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-08-16 07:43:36 (GMT)
commit15a27a700945570fe61eddde22e95458ad6e419a (patch)
tree069ccd2294b635b1b0008f882d94f6471e6bb24a
parentbf6e16ca647c549fab4e6f6fc83ddc87d3ea9bc4 (diff)
downloadswift-15a27a700945570fe61eddde22e95458ad6e419a.zip
swift-15a27a700945570fe61eddde22e95458ad6e419a.tar.bz2
Fix Cocoa-Boost conflict.
This one only seems to appear when using CLang. Change-Id: Ib12fbeb3da0dfb54aef0613c7b9eba577654cd6a
-rw-r--r--Slimber/Cocoa/CocoaController.h4
-rw-r--r--Slimber/Cocoa/CocoaMenulet.h4
-rw-r--r--SwifTools/Dock/MacOSXDock.mm3
3 files changed, 9 insertions, 2 deletions
diff --git a/Slimber/Cocoa/CocoaController.h b/Slimber/Cocoa/CocoaController.h
index 27542c6..24070c6 100644
--- a/Slimber/Cocoa/CocoaController.h
+++ b/Slimber/Cocoa/CocoaController.h
@@ -1,9 +1,11 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2012 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
+// Fix Boost-Cocoa conflict
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
#include <Cocoa/Cocoa.h>
class MainController;
diff --git a/Slimber/Cocoa/CocoaMenulet.h b/Slimber/Cocoa/CocoaMenulet.h
index 5c7c33e..0edceea 100644
--- a/Slimber/Cocoa/CocoaMenulet.h
+++ b/Slimber/Cocoa/CocoaMenulet.h
@@ -1,11 +1,13 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2012 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#pragma once
+// Fix Boost-Cocoa conflict
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
#include <Cocoa/Cocoa.h>
#include "Slimber/Menulet.h"
diff --git a/SwifTools/Dock/MacOSXDock.mm b/SwifTools/Dock/MacOSXDock.mm
index b8374fa..3164998 100644
--- a/SwifTools/Dock/MacOSXDock.mm
+++ b/SwifTools/Dock/MacOSXDock.mm
@@ -1,3 +1,6 @@
+// Fix Boost-Cocoa conflict
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+
#include <SwifTools/Dock/MacOSXDock.h>
#include <AppKit/AppKit.h>