Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-23 14:09:28 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-12-23 14:43:23 (GMT) |
| commit | da7d7a0ca71b80281aa9ff2526290b61ccb0cc60 (patch) | |
| tree | 3d46d3d408ac25b85ea5b8986498f0daadcc59bf /Slimber/Cocoa | |
| parent | bba30999facd5c93bb6968901ecf10eba861b27b (diff) | |
| download | swift-da7d7a0ca71b80281aa9ff2526290b61ccb0cc60.zip swift-da7d7a0ca71b80281aa9ff2526290b61ccb0cc60.tar.bz2 | |
Fix Cocoa-Boost conflict.
This one only seems to appear when using CLang.
Change-Id: Ib12fbeb3da0dfb54aef0613c7b9eba577654cd6a
Diffstat (limited to 'Slimber/Cocoa')
| -rw-r--r-- | Slimber/Cocoa/CocoaController.h | 4 | ||||
| -rw-r--r-- | Slimber/Cocoa/CocoaMenulet.h | 4 |
2 files changed, 6 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" |