diff options
| author | kjnash <k.j.nash@usa.net> | 2022-09-15 14:58:59 (GMT) |
|---|---|---|
| committer | kjnash <k.j.nash@usa.net> | 2022-09-15 14:58:59 (GMT) |
| commit | 9e810a504500232f79a23de35a33127dc19bd34b (patch) | |
| tree | 075ab3f448d6e167ba88e6aa574cce3c881b44e2 /generic/tclOOCall.c | |
| parent | aca6eed0f36ee531e3e3c8eeb6c6c966ad80057f (diff) | |
| parent | 0371b9ed8d4bd0943122234faf1c03cfc14b3405 (diff) | |
| download | tcl-9e810a504500232f79a23de35a33127dc19bd34b.zip tcl-9e810a504500232f79a23de35a33127dc19bd34b.tar.gz tcl-9e810a504500232f79a23de35a33127dc19bd34b.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclOOCall.c')
| -rw-r--r-- | generic/tclOOCall.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c index a9ed6bf..fc36f90 100644 --- a/generic/tclOOCall.c +++ b/generic/tclOOCall.c @@ -306,7 +306,7 @@ FreeMethodNameRep( int TclOOInvokeContext( - ClientData clientData, /* The method call context. */ + void *clientData, /* The method call context. */ Tcl_Interp *interp, /* Interpreter for error reporting, and many * other sorts of context handling (e.g., * commands, variables) depending on method @@ -379,7 +379,7 @@ TclOOInvokeContext( static int SetFilterFlags( - ClientData data[], + void *data[], TCL_UNUSED(Tcl_Interp *), int result) { @@ -391,7 +391,7 @@ SetFilterFlags( static int ResetFilterFlags( - ClientData data[], + void *data[], TCL_UNUSED(Tcl_Interp *), int result) { @@ -403,7 +403,7 @@ ResetFilterFlags( static int FinalizeMethodRefs( - ClientData data[], + void *data[], TCL_UNUSED(Tcl_Interp *), int result) { @@ -1094,7 +1094,7 @@ InitCallChain( * location being reusable is: * - Refers to the same object (same creation epoch), and * - Still across the same class structure (same global epoch), and - * - Still across the same object strucutre (same local epoch), and + * - Still across the same object structure (same local epoch), and * - No public/private/filter magic leakage (same flags, modulo the fact * that a public chain will satisfy a non-public call). * @@ -1153,7 +1153,8 @@ TclOOGetCallContext( CallContext *contextPtr; CallChain *callPtr; struct ChainBuilder cb; - int i, count, doFilters, donePrivate = 0; + int i, count; + int doFilters, donePrivate = 0; Tcl_HashEntry *hPtr; Tcl_HashTable doneFilters; @@ -1546,7 +1547,8 @@ AddClassFiltersToCallContext( int flags) /* Whether we've gone along a mixin link * yet. */ { - int i, clearedFlags = + int i; + int clearedFlags = flags & ~(TRAVERSED_MIXIN|OBJECT_MIXIN|BUILDING_MIXINS); Class *superPtr, *mixinPtr; Tcl_Obj *filterObj; |