summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-01-14 15:03:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-01-14 15:03:17 (GMT)
commit7ed5e3e07f3c4dbb54bc99051813ccc6bd05ed21 (patch)
tree8c68eb94b5973b5b949c1889fe8bd8eb223abd0d
parenta23fb5087b321cddd5b2eb97d8381b3ed742a874 (diff)
downloadswift-contrib-7ed5e3e07f3c4dbb54bc99051813ccc6bd05ed21.zip
swift-contrib-7ed5e3e07f3c4dbb54bc99051813ccc6bd05ed21.tar.bz2
Include intrusive_ptr after intrusive_ptr_ref functions.
This avoids compilation problems with CLang.
-rw-r--r--SwifTools/Cocoa/CocoaUtil.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/SwifTools/Cocoa/CocoaUtil.h b/SwifTools/Cocoa/CocoaUtil.h
index 55fc325..5bb3612 100644
--- a/SwifTools/Cocoa/CocoaUtil.h
+++ b/SwifTools/Cocoa/CocoaUtil.h
@@ -11,8 +11,6 @@
#define STD2NSSTRING(a) [NSString stringWithCString:a.c_str() encoding:NSUTF8StringEncoding]
// Intrusive pointer for NSObjects
-#include <boost/intrusive_ptr.hpp>
-
namespace boost {
inline void intrusive_ptr_add_ref(NSObject* object) {
[object retain];
@@ -22,3 +20,8 @@ namespace boost {
[object release];
}
}
+
+// Including intrusive_ptr after ref/release methods to avoid compilation
+// errors with CLang
+
+#include <boost/intrusive_ptr.hpp>