OSX copmpatibility tweak.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@39239 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2015-12-22 18:35:37 +00:00
parent 27de2178a1
commit 641ffccca1
3 changed files with 21 additions and 7 deletions

View file

@ -1,3 +1,9 @@
2015-12-22 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSXMLElement.m: For OSX compatibility, raise an exception
it we attempt to insert an element which is already the child of
some other element.
2015-11-30: Niels Grewe <niels.grewe@halbordnung.de>
* Source/NSCalendar.h
@ -10,12 +16,14 @@
2015-11-22 Riccardo Mottola <rm@gnu.org>
* Source/NSFileManager.m (createDirectoryAtPath)
Should return success even if all path components do exist, as by Apple spec.
Should return success even if all path components do exist,
as by Apple spec.
2015-11-13 Riccardo Mottola <rm@gnu.org>
* Source/NSRange.m: (NSRangeFromString)
Parse length and location with scanInteger and not scanInt (suggested by Fred Kiefer to fix 64bit)
Parse length and location with scanInteger and not scanInt
(suggested by Fred Kiefer to fix 64bit)
2015-11-02 Richard Frith-Macdonald <rfm@gnu.org>

View file

@ -657,10 +657,16 @@ extern void ensure_oldNs(xmlNodePtr node);
NSAssert(NSXMLNamespaceKind != theKind, NSInvalidArgumentException);
NSAssert(NSXMLNotationDeclarationKind != theKind, NSInvalidArgumentException);
if (nil != [child parent])
{
[child detach];
}
/* On OSX we get NSInternalInconsistencyException if we try to add an element
* which is already a child of some other parent. So presumably we shouldn't
* be auto-removing...
*
* if (nil != [child parent])
* {
* [child detach];
* }
*/
NSAssert(nil == [child parent], NSInternalInconsistencyException);
[self _insertChild: child atIndex: index];
}

View file

@ -45,7 +45,7 @@ int main()
PASS_EXCEPTION([root2 insertChild: child1 atIndex: 0],
NSInternalInconsistencyException,
"cannot add a child to to parents");
"cannot add a child if it has a parent");
{
NSXMLNode *c;