Index: src/OFCharacterSet.h ================================================================== --- src/OFCharacterSet.h +++ src/OFCharacterSet.h @@ -27,11 +27,11 @@ * * @note Subclasses must implement @ref characterIsMember:. */ @interface OFCharacterSet: OFObject { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFCharacterSet, 4) } #ifdef OF_HAVE_CLASS_PROPERTIES @property (class, readonly, nonatomic) OFCharacterSet *whitespaceCharacterSet; #endif Index: src/OFColor.h ================================================================== --- src/OFColor.h +++ src/OFColor.h @@ -25,11 +25,11 @@ * @brief A class for storing a color. */ @interface OFColor: OFObject { float _red, _green, _blue, _alpha; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFColor, 4) } #ifdef OF_HAVE_CLASS_PROPERTIES @property (class, readonly, nonatomic) OFColor *black; @property (class, readonly, nonatomic) OFColor *silver; Index: src/OFDNSQuery.h ================================================================== --- src/OFDNSQuery.h +++ src/OFDNSQuery.h @@ -30,11 +30,11 @@ @interface OFDNSQuery: OFObject { OFString *_domainName; of_dns_class_t _DNSClass; of_dns_record_type_t _recordType; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFDNSQuery, 4) } /*! * @brief The domain name of the query. */ Index: src/OFDNSResourceRecord.h ================================================================== --- src/OFDNSResourceRecord.h +++ src/OFDNSResourceRecord.h @@ -76,11 +76,11 @@ { OFString *_name; of_dns_class_t _DNSClass; of_dns_record_type_t _recordType; uint32_t _TTL; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFDNSResourceRecord, 4) } /** * @brief The domain name to which the resource record belongs. */ Index: src/OFDNSResponse.h ================================================================== --- src/OFDNSResponse.h +++ src/OFDNSResponse.h @@ -35,11 +35,11 @@ { OFString *_domainName; of_dns_response_records_t _answerRecords; of_dns_response_records_t _authorityRecords; of_dns_response_records_t _additionalRecords; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFDNSResponse, 4) } /*! * @brief The domain name of the response. */ Index: src/OFData.h ================================================================== --- src/OFData.h +++ src/OFData.h @@ -42,11 +42,11 @@ unsigned char *_items; size_t _count, _itemSize; bool _freeWhenDone; @private OFData *_parentData; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFData, 4) } /*! * @brief The size of a single item in the OFData in bytes. */ Index: src/OFDatagramSocket.h ================================================================== --- src/OFDatagramSocket.h +++ src/OFDatagramSocket.h @@ -115,11 +115,11 @@ bool _canBlock; #ifdef OF_WII bool _canSendToBroadcastAddresses; #endif id _Nullable _delegate; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFDatagramSocket, 4) } /*! * @brief Whether the socket can block. * Index: src/OFEnumerator.h ================================================================== --- src/OFEnumerator.h +++ src/OFEnumerator.h @@ -95,11 +95,11 @@ @interface OFEnumerator OF_GENERIC(ObjectType): OFObject #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # define ObjectType id #endif { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFEnumerator, 4) } /*! * @brief Returns the next object or `nil` if there is none left. * Index: src/OFHTTPCookie.h ================================================================== --- src/OFHTTPCookie.h +++ src/OFHTTPCookie.h @@ -35,11 +35,11 @@ { OFString *_name, *_value, *_domain, *_path; OFDate *_Nullable _expires; bool _secure, _HTTPOnly; OFMutableArray OF_GENERIC(OFString *) *_extensions; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFHTTPCookie, 4) } /*! * @brief The name of the cookie. */ Index: src/OFHTTPRequest.h ================================================================== --- src/OFHTTPRequest.h +++ src/OFHTTPRequest.h @@ -76,11 +76,11 @@ OFURL *_URL; of_http_request_method_t _method; of_http_request_protocol_version_t _protocolVersion; OFDictionary OF_GENERIC(OFString *, OFString *) *_Nullable _headers; of_socket_address_t _remoteAddress; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFHTTPRequest, 4) } /*! * @brief The URL of the HTTP request. */ Index: src/OFHTTPResponse.h ================================================================== --- src/OFHTTPResponse.h +++ src/OFHTTPResponse.h @@ -31,11 +31,11 @@ @interface OFHTTPResponse: OFStream { of_http_request_protocol_version_t _protocolVersion; short _statusCode; OFDictionary OF_GENERIC(OFString *, OFString *) *_headers; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFHTTPResponse, 4) } /*! * @brief The protocol version of the HTTP request reply. */ Index: src/OFIPXSocket.h ================================================================== --- src/OFIPXSocket.h +++ src/OFIPXSocket.h @@ -51,11 +51,11 @@ @interface OFIPXSocket: OFDatagramSocket { #ifndef OF_WINDOWS uint8_t _packetType; #endif - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFIPXSocket, 4) } /*! * @brief The delegate for asynchronous operations on the socket. * Index: src/OFInvocation.h ================================================================== --- src/OFInvocation.h +++ src/OFInvocation.h @@ -43,11 +43,11 @@ @interface OFInvocation: OFObject { OFMethodSignature *_methodSignature; OFMutableArray OF_GENERIC(OFMutableData *) *_arguments; OFMutableData *_returnValue; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFInvocation, 4) } /*! * @brief The method signature for the invocation. */ Index: src/OFKernelEventObserver.h ================================================================== --- src/OFKernelEventObserver.h +++ src/OFKernelEventObserver.h @@ -134,11 +134,11 @@ struct sockaddr_in _cancelAddr; #endif #ifdef OF_AMIGAOS ULONG _execSignalMask; #endif - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFKernelEventObserver, 4) } /*! * @brief The delegate for the OFKernelEventObserver. */ Index: src/OFLHAArchiveEntry.h ================================================================== --- src/OFLHAArchiveEntry.h +++ src/OFLHAArchiveEntry.h @@ -42,11 +42,11 @@ OFString *_Nullable _fileComment; OFNumber *_Nullable _mode, *_Nullable _UID, *_Nullable _GID; OFString *_Nullable _owner, *_Nullable _group; OFDate *_Nullable _modificationDate; OFMutableArray OF_GENERIC(OFData *) *_extensions; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFLHAArchiveEntry, 4) } /*! * @brief The file name of the entry. */ Index: src/OFList.h ================================================================== --- src/OFList.h +++ src/OFList.h @@ -53,11 +53,11 @@ { of_list_object_t *_Nullable _firstListObject; of_list_object_t *_Nullable _lastListObject; size_t _count; unsigned long _mutations; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFList, 4) } /*! * @brief The first list object of the list. */ Index: src/OFMessagePackExtension.h ================================================================== --- src/OFMessagePackExtension.h +++ src/OFMessagePackExtension.h @@ -31,11 +31,11 @@ @interface OFMessagePackExtension: OFObject { int8_t _type; OFData *_data; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMessagePackExtension, 4) } /*! * @brief The MessagePack extension type. */ Index: src/OFMethodSignature.h ================================================================== --- src/OFMethodSignature.h +++ src/OFMethodSignature.h @@ -28,11 +28,11 @@ */ @interface OFMethodSignature: OFObject { char *_types; OFMutableData *_typesPointers, *_offsets; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMethodSignature, 4) } /*! * @brief The number of arguments of the method. */ Index: src/OFMutableData.h ================================================================== --- src/OFMutableData.h +++ src/OFMutableData.h @@ -28,11 +28,11 @@ * @brief A class for storing and manipulating arbitrary data in an array. */ @interface OFMutableData: OFData { size_t _capacity; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMutableData, 4) } /*! * @brief All items of the OFMutableData as a C array. * Index: src/OFMutableLHAArchiveEntry.h ================================================================== --- src/OFMutableLHAArchiveEntry.h +++ src/OFMutableLHAArchiveEntry.h @@ -25,11 +25,11 @@ * * @brief A class which represents a mutable entry in an LHA archive. */ @interface OFMutableLHAArchiveEntry: OFLHAArchiveEntry { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMutableLHAArchiveEntry, 4) } /*! * @brief The file name of the entry. */ Index: src/OFMutablePair.h ================================================================== --- src/OFMutablePair.h +++ src/OFMutablePair.h @@ -29,11 +29,11 @@ #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # define FirstType id # define SecondType id #endif { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMutablePair, 4) } /*! * @brief The first object of the pair. */ Index: src/OFMutableTarArchiveEntry.h ================================================================== --- src/OFMutableTarArchiveEntry.h +++ src/OFMutableTarArchiveEntry.h @@ -25,11 +25,11 @@ * * @brief A class which represents a mutable entry of a tar archive. */ @interface OFMutableTarArchiveEntry: OFTarArchiveEntry { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMutableTarArchiveEntry, 4) } /*! * @brief The file name of the entry. */ Index: src/OFMutableTriple.h ================================================================== --- src/OFMutableTriple.h +++ src/OFMutableTriple.h @@ -30,11 +30,11 @@ # define FirstType id # define SecondType id # define ThirdType id #endif { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMutableTriple, 4) } /*! * @brief The first object of the triple. */ Index: src/OFMutableURL.h ================================================================== --- src/OFMutableURL.h +++ src/OFMutableURL.h @@ -24,11 +24,11 @@ * * @brief A class for parsing URLs and accessing parts of it. */ @interface OFMutableURL: OFURL { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMutableURL, 4) } /*! * @brief The scheme part of the URL. */ Index: src/OFMutableZIPArchiveEntry.h ================================================================== --- src/OFMutableZIPArchiveEntry.h +++ src/OFMutableZIPArchiveEntry.h @@ -26,11 +26,11 @@ * @brief A class which represents a mutable entry in the central directory of * a ZIP archive. */ @interface OFMutableZIPArchiveEntry: OFZIPArchiveEntry { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMutableZIPArchiveEntry, 4) } /*! * @brief The file name of the entry. */ Index: src/OFMutex.h ================================================================== --- src/OFMutex.h +++ src/OFMutex.h @@ -30,11 +30,11 @@ @interface OFMutex: OFObject { of_mutex_t _mutex; bool _initialized; OFString *_Nullable _name; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFMutex, 4) } /*! * @brief Creates a new mutex. * Index: src/OFPair.h ================================================================== --- src/OFPair.h +++ src/OFPair.h @@ -31,11 +31,11 @@ # define SecondType id #endif { FirstType _Nullable _firstObject; SecondType _Nullable _secondObject; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFPair, 4) } /*! * @brief The first object of the pair. */ Index: src/OFPlugin.h ================================================================== --- src/OFPlugin.h +++ src/OFPlugin.h @@ -39,11 +39,11 @@ * @brief Provides a system for loading plugins at runtime. */ @interface OFPlugin: OFObject { of_plugin_handle_t _pluginHandle; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFPlugin, 4) } /*! * @brief Loads a plugin from a file. * Index: src/OFSCTPSocket.h ================================================================== --- src/OFSCTPSocket.h +++ src/OFSCTPSocket.h @@ -66,11 +66,11 @@ * To connect to a server, create a socket and connect it. * To create a server, create a socket, bind it and listen on it. */ @interface OFSCTPSocket: OFSequencedPacketSocket { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSCTPSocket, 4) } /*! * @brief Whether sending packets can be delayed. Setting this to NO sets * SCTP_NODELAY on the socket. Index: src/OFSHA224Or256Hash.h ================================================================== --- src/OFSHA224Or256Hash.h +++ src/OFSHA224Or256Hash.h @@ -41,10 +41,10 @@ size_t bufferLength; } *_iVars; @private bool _allowsSwappableMemory; bool _calculated; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSHA224Or256Hash, 4) } @end OF_ASSUME_NONNULL_END Index: src/OFSHA384Or512Hash.h ================================================================== --- src/OFSHA384Or512Hash.h +++ src/OFSHA384Or512Hash.h @@ -41,10 +41,10 @@ size_t bufferLength; } *_iVars; @private bool _allowsSwappableMemory; bool _calculated; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSHA384Or512Hash, 4) } @end OF_ASSUME_NONNULL_END Index: src/OFSPXSocket.h ================================================================== --- src/OFSPXSocket.h +++ src/OFSPXSocket.h @@ -70,11 +70,11 @@ * To connect to a server, create a socket and connect it. * To create a server, create a socket, bind it and listen on it. */ @interface OFSPXSocket: OFSequencedPacketSocket { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSPXSocket, 4) } /*! * @brief The delegate for asynchronous operations on the socket. * Index: src/OFSPXStreamSocket.h ================================================================== --- src/OFSPXStreamSocket.h +++ src/OFSPXStreamSocket.h @@ -72,11 +72,11 @@ * To connect to a server, create a socket and connect it. * To create a server, create a socket, bind it and listen on it. */ @interface OFSPXStreamSocket: OFStreamSocket { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSPXStreamSocket, 4) } /*! * @brief The delegate for asynchronous operations on the socket. * Index: src/OFSandbox.h ================================================================== --- src/OFSandbox.h +++ src/OFSandbox.h @@ -69,11 +69,11 @@ unsigned int _allowsUnveil: 1; unsigned int _returnsErrors: 1; OFMutableArray OF_GENERIC(of_sandbox_unveil_path_t) *_unveiledPaths; @public size_t _unveiledPathsIndex; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSandbox, 4) } /*! * @brief Allows IO operations on previously allocated file descriptors. */ Index: src/OFSeekableStream.h ================================================================== --- src/OFSeekableStream.h +++ src/OFSeekableStream.h @@ -55,11 +55,11 @@ * override this methods without the `lowlevel` prefix, you *will* break * caching, get broken results and seek to the wrong position! */ @interface OFSeekableStream: OFStream { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSeekableStream, 4) } /*! * @brief Seeks to the specified absolute offset. * Index: src/OFSequencedPacketSocket.h ================================================================== --- src/OFSequencedPacketSocket.h +++ src/OFSequencedPacketSocket.h @@ -131,11 +131,11 @@ { of_socket_t _socket; bool _canBlock, _listening; of_socket_address_t _remoteAddress; id _Nullable _delegate; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSequencedPacketSocket, 4) } /*! * @brief Whether the socket can block. * Index: src/OFSettings.h ================================================================== --- src/OFSettings.h +++ src/OFSettings.h @@ -34,11 +34,11 @@ * @brief A class for storing and retrieving settings */ @interface OFSettings: OFObject { OFString *_applicationName; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSettings, 4) } /*! * @brief The name of the application whose settings are accessed by the * instance. Index: src/OFSortedList.h ================================================================== --- src/OFSortedList.h +++ src/OFSortedList.h @@ -30,11 +30,11 @@ @interface OFSortedList OF_GENERIC(ObjectType): OFList OF_GENERIC(ObjectType) #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # define ObjectType id #endif { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFSortedList, 4) } - (of_list_object_t *)appendObject: (ObjectType)object OF_UNAVAILABLE; - (of_list_object_t *)prependObject: (ObjectType)object OF_UNAVAILABLE; - (of_list_object_t *)insertObject: (ObjectType)object Index: src/OFStream.h ================================================================== --- src/OFStream.h +++ src/OFStream.h @@ -197,11 +197,11 @@ #endif char *_Nullable _readBuffer, *_Nullable _readBufferMemory; char *_Nullable _writeBuffer; size_t _readBufferLength, _writeBufferLength; bool _buffersWrites, _waitingForDelimiter; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFStream, 4) } /*! * @brief Whether the end of the stream has been reached. */ Index: src/OFStreamSocket.h ================================================================== --- src/OFStreamSocket.h +++ src/OFStreamSocket.h @@ -69,11 +69,11 @@ OFReadyForWritingObserving> { of_socket_t _socket; bool _atEndOfStream, _listening; of_socket_address_t _remoteAddress; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFStreamSocket, 4) } /*! * @brief Whether the socket is a listening socket. */ Index: src/OFTCPSocket.h ================================================================== --- src/OFTCPSocket.h +++ src/OFTCPSocket.h @@ -70,11 +70,11 @@ OFString *_Nullable _SOCKS5Host; uint16_t _SOCKS5Port; #ifdef OF_WII uint16_t _port; #endif - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFTCPSocket, 4) } #ifdef OF_HAVE_CLASS_PROPERTIES @property (class, nullable, copy, nonatomic) OFString *SOCKS5Host; @property (class, nonatomic) uint16_t SOCKS5Port; Index: src/OFTarArchiveEntry.h ================================================================== --- src/OFTarArchiveEntry.h +++ src/OFTarArchiveEntry.h @@ -59,11 +59,11 @@ OFDate *_modificationDate; of_tar_archive_entry_type_t _type; OFString *_Nullable _targetFileName; OFString *_Nullable _owner, *_Nullable _group; unsigned long _deviceMajor, _deviceMinor; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFTarArchiveEntry, 4) } /*! * @brief The file name of the entry. */ Index: src/OFThread.h ================================================================== --- src/OFThread.h +++ src/OFThread.h @@ -86,11 +86,11 @@ OFMutableDictionary *_threadDictionary; OFString *_Nullable _name; # ifdef OF_HAVE_SOCKETS OFDNSResolver *_DNSResolver; # endif - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFThread, 4) } #endif #ifdef OF_HAVE_CLASS_PROPERTIES # ifdef OF_HAVE_THREADS Index: src/OFTriple.h ================================================================== --- src/OFTriple.h +++ src/OFTriple.h @@ -33,11 +33,11 @@ #endif { FirstType _Nullable _firstObject; SecondType _Nullable _secondObject; ThirdType _Nullable _thirdObject; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFTriple, 4) } /*! * @brief The first object of the triple. */ Index: src/OFUDPSocket.h ================================================================== --- src/OFUDPSocket.h +++ src/OFUDPSocket.h @@ -51,11 +51,11 @@ @interface OFUDPSocket: OFDatagramSocket { #ifdef OF_WII uint16_t _port; #endif - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFUDPSocket, 4) } /*! * @brief The delegate for asynchronous operations on the socket. * Index: src/OFURL.h ================================================================== --- src/OFURL.h +++ src/OFURL.h @@ -35,11 +35,11 @@ OFString *_Nullable _URLEncodedScheme, *_Nullable _URLEncodedHost; OFNumber *_Nullable _port; OFString *_Nullable _URLEncodedUser, *_Nullable _URLEncodedPassword; OFString *_Nullable _URLEncodedPath; OFString *_Nullable _URLEncodedQuery, *_Nullable _URLEncodedFragment; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFURL, 4) } /*! * @brief The scheme part of the URL. */ Index: src/OFURLHandler.h ================================================================== --- src/OFURLHandler.h +++ src/OFURLHandler.h @@ -32,11 +32,11 @@ * @brief A handler for a URL scheme. */ @interface OFURLHandler: OFObject { OFString *_scheme; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFURLHandler, 4) } /*! * @brief The scheme this OFURLHandler handles. */ Index: src/OFValue.h ================================================================== --- src/OFValue.h +++ src/OFValue.h @@ -24,11 +24,11 @@ * * @brief A class for storing arbitrary values in an object. */ @interface OFValue: OFObject { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFValue, 4) } /*! * @brief The ObjC type encoding of the value. */ Index: src/OFXMLAttribute.h ================================================================== --- src/OFXMLAttribute.h +++ src/OFXMLAttribute.h @@ -31,11 +31,11 @@ #if defined(OF_XML_ELEMENT_M) || defined(OF_XML_PARSER_M) @public #endif OFString *_name, *_Nullable _namespace, *_stringValue; bool _useDoubleQuotes; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFXMLAttribute, 4) } /*! * @brief The name of the attribute. */ Index: src/OFXMLCDATA.h ================================================================== --- src/OFXMLCDATA.h +++ src/OFXMLCDATA.h @@ -25,11 +25,11 @@ * @brief A class representing XML CDATA. */ @interface OFXMLCDATA: OFXMLNode { OFString *_CDATA; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFXMLCDATA, 4) } /*! * @brief Creates a new OFXMLCDATA with the specified string. * Index: src/OFXMLCharacters.h ================================================================== --- src/OFXMLCharacters.h +++ src/OFXMLCharacters.h @@ -25,11 +25,11 @@ * @brief A class representing XML characters. */ @interface OFXMLCharacters: OFXMLNode { OFString *_characters; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFXMLCharacters, 4) } /*! * @brief Creates a new OFXMLCharacters with the specified string. * Index: src/OFXMLComment.h ================================================================== --- src/OFXMLComment.h +++ src/OFXMLComment.h @@ -25,11 +25,11 @@ * @brief A class for representing XML comments. */ @interface OFXMLComment: OFXMLNode { OFString *_comment; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFXMLComment, 4) } /*! * @brief Creates a new OFXMLComment with the specified string. * Index: src/OFXMLElement.h ================================================================== --- src/OFXMLElement.h +++ src/OFXMLElement.h @@ -36,11 +36,11 @@ OFString *_name, *_Nullable _namespace, *_Nullable _defaultNamespace; OFMutableArray OF_GENERIC(OFXMLAttribute *) *_Nullable _attributes; OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_Nullable _namespaces; OFMutableArray OF_GENERIC(OFXMLNode *) *_Nullable _children; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFXMLElement, 4) } /*! * @brief The name of the element. */ Index: src/OFXMLElementBuilder.h ================================================================== --- src/OFXMLElementBuilder.h +++ src/OFXMLElementBuilder.h @@ -106,11 +106,11 @@ */ @interface OFXMLElementBuilder: OFObject { OFMutableArray OF_GENERIC(OFXMLElement *) *_stack; id _Nullable _delegate; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFXMLElementBuilder, 4) } /*! * @brief The delegate for the OFXMLElementBuilder. */ Index: src/OFXMLNode.h ================================================================== --- src/OFXMLNode.h +++ src/OFXMLNode.h @@ -27,11 +27,11 @@ * * @brief A class which stores an XML element. */ @interface OFXMLNode: OFObject { - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFXMLNode, 4) } /*! * @brief The contents of the node as a string value. * Index: src/OFXMLProcessingInstructions.h ================================================================== --- src/OFXMLProcessingInstructions.h +++ src/OFXMLProcessingInstructions.h @@ -26,11 +26,11 @@ * @brief A class for representing XML processing instructions. */ @interface OFXMLProcessingInstructions: OFXMLNode { OFString *_processingInstructions; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFXMLProcessingInstructions, 4) } /*! * @brief Creates a new OFXMLProcessingInstructions with the specified string. * Index: src/OFZIPArchiveEntry.h ================================================================== --- src/OFZIPArchiveEntry.h +++ src/OFZIPArchiveEntry.h @@ -110,11 +110,11 @@ OFString *_Nullable _fileComment; uint32_t _startDiskNumber; uint16_t _internalAttributes; uint32_t _versionSpecificAttributes; int64_t _localFileHeaderOffset; - OF_RESERVE_IVARS(4) + OF_RESERVE_IVARS(OFZIPArchiveEntry, 4) } /*! * @brief The file name of the entry. */ Index: src/macros.h ================================================================== --- src/macros.h +++ src/macros.h @@ -134,15 +134,15 @@ #if __OBJFW_RUNTIME_ABI__ || (defined(OF_APPLE_RUNTIME) && defined(__OBJC2__)) # define OF_HAVE_NONFRAGILE_IVARS #endif #ifdef OF_HAVE_NONFRAGILE_IVARS -# define OF_RESERVE_IVARS(num) +# define OF_RESERVE_IVARS(cls, num) #else -# define OF_RESERVE_IVARS(num) \ +# define OF_RESERVE_IVARS(cls, num) \ @private \ - void *OF_PREPROCESSOR_CONCAT(_reserved, __COUNTER__)[num]; + void *OF_PREPROCESSOR_CONCAT(_reserved_, cls)[num]; #endif #ifdef __GNUC__ # define OF_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) #else