Author: thebeing
Date: Thu Jan 14 01:21:04 2016
New Revision: 39268
URL: http://svn.gna.org/viewcvs/gnustep?rev=39268&view=rev
Log:
Fix for inclusion of header in ARC code
Modified:
libs/webserver/trunk/ChangeLog
libs/webserver/trunk/WebServer.h
Modified: libs/webserver/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webserver/trunk/ChangeLog?rev=39268&r1=39267&r2=39268&view=diff
==============================================================================
--- libs/webserver/trunk/ChangeLog (original)
+++ libs/webserver/trunk/ChangeLog Thu Jan 14 01:21:04 2016
@@ -1,3 +1,8 @@
+2016-01-15 Niels Grewe <[email protected]>
+
+ * WebServer.h: Ensure that the header can be used from ARC
+ code.
+
2016-01-14 Niels Grewe <[email protected]>
* GNUmakefile: Build correctly with the ng and gnugc
Modified: libs/webserver/trunk/WebServer.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/webserver/trunk/WebServer.h?rev=39268&r1=39267&r2=39268&view=diff
==============================================================================
--- libs/webserver/trunk/WebServer.h (original)
+++ libs/webserver/trunk/WebServer.h Thu Jan 14 01:21:04 2016
@@ -336,6 +336,16 @@
@end
+/*
+ * For interoperability with ARC code, we must tag the two unused id*
+ * instance variables as not participating in ARC.
+ */
+#if __has_feature(objc_arc)
+#define UNUSED_QUAL __unsafe_unretained
+#else
+#define UNUSED_QUAL
+#endif
+
/**
* <p>You create an instance of the WebServer class in order to handle
* incoming HTTP or HTTPS requests on a single port.
@@ -397,8 +407,8 @@
NSMutableArray *_ioThreads;
GSThreadPool *_pool;
WebServerConfig *_conf;
- id *_unused1;
- id *_unused2;
+ id UNUSED_QUAL *_unused1;
+ id UNUSED_QUAL *_unused2;
NSDictionary *_sslConfig;
BOOL _accepting;
BOOL _doPostProcess;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
