Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-29 16:02:21 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-10-30 12:49:29 (GMT) |
| commit | 8719b25e0dda4c8dae30c86ff88315e0e7fa9e1c (patch) | |
| tree | deb01d4eeadf3114b11279518d6d67a5100f54d3 /SwifTools/Dock | |
| parent | cb62de17d1e17fd3049a6bc8155a100574a42a85 (diff) | |
| download | swift-8719b25e0dda4c8dae30c86ff88315e0e7fa9e1c.zip swift-8719b25e0dda4c8dae30c86ff88315e0e7fa9e1c.tar.bz2 | |
Remove Boost workaround for OS X headers
Older versions of OS X define the same symbol as Boost does.
The workaround, defining
__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES as 0
worked around this issue, however __ prefixed defines are
considered private and cause the warning
"macro name is a reserved identifier [-Wreserved-id-macro]".
Test-Information:
Builds and unit tests pass on OS X 10.10.5.
Change-Id: I489ec201dc31fb4e43336da690c7d348a7d0d9ca
Diffstat (limited to 'SwifTools/Dock')
| -rw-r--r-- | SwifTools/Dock/MacOSXDock.mm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/SwifTools/Dock/MacOSXDock.mm b/SwifTools/Dock/MacOSXDock.mm index 3164998..8c196d8 100644 --- a/SwifTools/Dock/MacOSXDock.mm +++ b/SwifTools/Dock/MacOSXDock.mm @@ -1,5 +1,8 @@ -// Fix Boost-Cocoa conflict -#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 +/* + * Copyright (c) 2015 Isode Limited. + * All rights reserved. + * See the COPYING file for more information. + */ #include <SwifTools/Dock/MacOSXDock.h> |