From 51d6af8ca422dca26ffe01756ebb3a9f4ffd8b91 Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Fri, 19 Feb 2016 12:11:37 +0100 Subject: 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 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 +// 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; } -- cgit v0.10.2-6-g49f6