Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-02-19 11:11:37 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-02-29 17:51:34 (GMT) |
| commit | 51d6af8ca422dca26ffe01756ebb3a9f4ffd8b91 (patch) | |
| tree | 0235adfdcbc0ce52788b3cb37c879534d0f9d796 | |
| parent | b9272f22aab1409d111bd7b380f16e643786e42e (diff) | |
| download | swift-51d6af8ca422dca26ffe01756ebb3a9f4ffd8b91.zip swift-51d6af8ca422dca26ffe01756ebb3a9f4ffd8b91.tar.bz2 | |
Add workaround for building with Boost 1.60 as C++11
Test-Information:
Successfully built Swiften as C++11 with external Boost 1.60
on OS X 10.11.3.
Change-Id: I2c5a7c22f5f8c14ee7befcaeb84b7d1f093932f6
| -rw-r--r-- | Swiften/EventLoop/Cocoa/CocoaEvent.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Swiften/EventLoop/Cocoa/CocoaEvent.h b/Swiften/EventLoop/Cocoa/CocoaEvent.h index 4453c74..1e2c6f6 100644 --- a/Swiften/EventLoop/Cocoa/CocoaEvent.h +++ b/Swiften/EventLoop/Cocoa/CocoaEvent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,6 +8,10 @@ #include <Foundation/Foundation.h> +// The following line is a workaround for a bug in Boost 1.60 when building as C++11. +// See ticket #11897 and #11863 in Boost's bug tracker. +#undef check + namespace Swift { class CocoaEventLoop; } |