diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-10 14:47:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-10 14:47:21 (GMT) |
| commit | 9ac22a9200db4d034922f3f15194cc1f3568e230 (patch) | |
| tree | ece226b385bf0b07f5910bee412698ac534b425e /generic/tclStringObj.c | |
| parent | d30a8fa3d452bd96dd59335d6f94e12310ef8e3e (diff) | |
| parent | c6410375c4529e798dfdef177ee755680007fe58 (diff) | |
| download | tcl-9ac22a9200db4d034922f3f15194cc1f3568e230.zip tcl-9ac22a9200db4d034922f3f15194cc1f3568e230.tar.gz tcl-9ac22a9200db4d034922f3f15194cc1f3568e230.tar.bz2 | |
Merge 8.6 Use TclHasInternalRep() macro in more places.
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 41b2428..967fdd0 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -272,7 +272,7 @@ GrowStringBuffer( { /* * Preconditions: - * objPtr->typePtr == &tclStringType + * TclHasInternalRep(objPtr, &tclStringType) * needed > stringPtr->allocated * flag || objPtr->bytes != NULL */ @@ -323,7 +323,7 @@ GrowUnicodeBuffer( { /* * Preconditions: - * objPtr->typePtr == &tclStringType + * TclHasInternalRep(objPtr, &tclStringType) * needed > stringPtr->maxChars * needed < UNICHAR_STRING_MAXCHARS */ @@ -3528,7 +3528,7 @@ TclStringCat( binary = 0; if (ov > objv+1 && ISCONTINUATION(TclGetString(objPtr))) { forceUniChar = 1; - } else if ((objPtr->typePtr) && (objPtr->typePtr != &tclUniCharStringType)) { + } else if ((objPtr->typePtr) && !TclHasInternalRep(objPtr, &tclUniCharStringType)) { /* Prevent shimmer of non-string types. */ allowUniChar = 0; } |