ObjFW  Check-in [5826fb0441]

Overview
Comment:Fix compilation of ObjC++
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5826fb04411b5f46f30a6ba9c2e0682e77125d2945467758efe8c8e1ffe13677
User & Date: js on 2015-11-29 18:46:15
Other Links: manifest | tags
Context
2015-11-29
19:00
OFOptionsParser: Fix missing nil check check-in: 2c0ca29a9c user: js tags: trunk
18:46
Fix compilation of ObjC++ check-in: 5826fb0441 user: js tags: trunk
14:26
Remove defines we no longer need check-in: be8db49635 user: js tags: trunk
Changes

Modified src/OFXMLAttribute.h from [5607843c79] to [05af16cfec].

35
36
37
38
39
40
41

42




43
44
45
46
47
48
49
 * The name of the attribute.
 */
@property (readonly, copy) OFString *name;

/*!
 * The namespace of the attribute.
 */

@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *namespace;





/*!
 * @brief Creates a new XML attribute.
 *
 * @param name The name of the attribute
 * @param stringValue The string value of the attribute
 * @return A new autoreleased OFXMLAttribute with the specified parameters







>

>
>
>
>







35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
 * The name of the attribute.
 */
@property (readonly, copy) OFString *name;

/*!
 * The namespace of the attribute.
 */
#ifndef __cplusplus
@property OF_NULLABLE_PROPERTY (readonly, copy) OFString *namespace;
#else
@property OF_NULLABLE_PROPERTY (readonly, copy, getter=namespace)
    OFString *namespace_;
#endif

/*!
 * @brief Creates a new XML attribute.
 *
 * @param name The name of the attribute
 * @param stringValue The string value of the attribute
 * @return A new autoreleased OFXMLAttribute with the specified parameters

Modified src/OFXMLElement.h from [a01f4b45ec] to [3804eb7f15].

44
45
46
47
48
49
50

51




52
53
54
55
56
57
58
 * The name of the element.
 */
@property (copy) OFString *name;

/*!
 * The namespace of the element.
 */

@property OF_NULLABLE_PROPERTY (copy) OFString *namespace;





/*!
 * The default namespace for the element to be used if there is no parent.
 */
@property OF_NULLABLE_PROPERTY (copy) OFString *defaultNamespace;

/*!







>

>
>
>
>







44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
 * The name of the element.
 */
@property (copy) OFString *name;

/*!
 * The namespace of the element.
 */
#ifndef __cplusplus
@property OF_NULLABLE_PROPERTY (copy) OFString *namespace;
#else
@property OF_NULLABLE_PROPERTY (copy, getter=namespace, setter=setNamespace:)
    OFString *namespace_;
#endif

/*!
 * The default namespace for the element to be used if there is no parent.
 */
@property OF_NULLABLE_PROPERTY (copy) OFString *defaultNamespace;

/*!

Modified src/exceptions/OFUnboundNamespaceException.h from [f0b8161cc5] to [40a4b16c8e].

29
30
31
32
33
34
35

36



37
38
39
40
41
42
43
	OFString *_namespace;
	OFXMLElement *_element;
}

/*!
 * The unbound namespace.
 */

@property (readonly, copy) OFString *namespace;




/*!
 * The element in which the namespace was not bound.
 */
@property (readonly, retain) OFXMLElement *element;

/*!







>

>
>
>







29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
	OFString *_namespace;
	OFXMLElement *_element;
}

/*!
 * The unbound namespace.
 */
#ifndef __cplusplus
@property (readonly, copy) OFString *namespace;
#else
@property (readonly, copy, getter=namespace) OFString *namespace_;
#endif

/*!
 * The element in which the namespace was not bound.
 */
@property (readonly, retain) OFXMLElement *element;

/*!