summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-29 16:02:21 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-10-30 12:49:29 (GMT)
commit8719b25e0dda4c8dae30c86ff88315e0e7fa9e1c (patch)
treedeb01d4eeadf3114b11279518d6d67a5100f54d3 /Slimber/Cocoa
parentcb62de17d1e17fd3049a6bc8155a100574a42a85 (diff)
downloadswift-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 'Slimber/Cocoa')
-rw-r--r--Slimber/Cocoa/CocoaController.h6
-rw-r--r--Slimber/Cocoa/CocoaController.mm14
-rw-r--r--Slimber/Cocoa/CocoaMenulet.h8
3 files changed, 16 insertions, 12 deletions
diff --git a/Slimber/Cocoa/CocoaController.h b/Slimber/Cocoa/CocoaController.h
index 8f42fbf..f6881ae 100644
--- a/Slimber/Cocoa/CocoaController.h
+++ b/Slimber/Cocoa/CocoaController.h
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-// Fix Boost-Cocoa conflict
-#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#pragma once
+
#include <Cocoa/Cocoa.h>
class MainController;
diff --git a/Slimber/Cocoa/CocoaController.mm b/Slimber/Cocoa/CocoaController.mm
index 2ee350d..da1df98 100644
--- a/Slimber/Cocoa/CocoaController.mm
+++ b/Slimber/Cocoa/CocoaController.mm
@@ -1,8 +1,14 @@
-#include "Slimber/Cocoa/CocoaController.h"
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
-#include "Slimber/MainController.h"
-#include "Slimber/Cocoa/CocoaMenulet.h"
-#include "Slimber/Cocoa/main.h"
+#include <Slimber/Cocoa/CocoaController.h>
+
+#include <Slimber/MainController.h>
+#include <Slimber/Cocoa/CocoaMenulet.h>
+#include <Slimber/Cocoa/main.h>
@implementation CocoaController {
CocoaMenulet* menulet;
diff --git a/Slimber/Cocoa/CocoaMenulet.h b/Slimber/Cocoa/CocoaMenulet.h
index fa4848e..887fdf9 100644
--- a/Slimber/Cocoa/CocoaMenulet.h
+++ b/Slimber/Cocoa/CocoaMenulet.h
@@ -1,22 +1,20 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file 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>
-#include "Slimber/Menulet.h"
#include <SwifTools/Cocoa/CocoaAction.h>
class CocoaMenulet : public Menulet {
public:
CocoaMenulet();
- ~CocoaMenulet();
+ virtual ~CocoaMenulet();
private:
virtual void clear();