diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-26 15:58:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-26 15:58:55 (GMT) |
| commit | 74cf960de8057001c81e4533fd1972e89672f05d (patch) | |
| tree | 0c4a8c9ec995d60233ffef02c8bacaf3bc59977f | |
| parent | 6dc3f732c1fce6ecafbbfaefb823cf933b5e3efc (diff) | |
| parent | 3636d805fcf6da495f444297a7159347ff1ed3a0 (diff) | |
| download | tcl-74cf960de8057001c81e4533fd1972e89672f05d.zip tcl-74cf960de8057001c81e4533fd1972e89672f05d.tar.gz tcl-74cf960de8057001c81e4533fd1972e89672f05d.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclDecls.h | 10 | ||||
| -rw-r--r-- | generic/tclTest.c | 9 |
2 files changed, 18 insertions, 1 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 7ae6fc3..c403654 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3892,20 +3892,28 @@ extern const TclStubs *tclStubsPtr; #define Tcl_GlobalEval(interp, objPtr) \ Tcl_EvalEx(interp, objPtr, TCL_INDEX_NONE, TCL_EVAL_GLOBAL) #define Tcl_GetStringResult(interp) Tcl_GetString(Tcl_GetObjResult(interp)) +inline TCL_DEPRECATED_API("Use Tcl_SaveInterpState") void Tcl_SaveResult_(void) {} #define Tcl_SaveResult(interp, statePtr) \ do { \ + Tcl_SaveResult_(); \ *(statePtr) = Tcl_GetObjResult(interp); \ Tcl_IncrRefCount(*(statePtr)); \ Tcl_SetObjResult(interp, Tcl_NewObj()); \ } while(0) +inline TCL_DEPRECATED_API("Use Tcl_RestoreInterpState") void Tcl_RestoreResult_(void) {} #define Tcl_RestoreResult(interp, statePtr) \ do { \ + Tcl_RestoreResult_(); \ Tcl_ResetResult(interp); \ Tcl_SetObjResult(interp, *(statePtr)); \ Tcl_DecrRefCount(*(statePtr)); \ } while(0) +inline TCL_DEPRECATED_API("Use Tcl_DiscardInterpState") void Tcl_DiscardResult_(void) {} #define Tcl_DiscardResult(statePtr) \ - Tcl_DecrRefCount(*(statePtr)) + do { \ + Tcl_DiscardResult_(); \ + Tcl_DecrRefCount(*(statePtr)); \ + } while(0) #define Tcl_SetResult(interp, result, freeProc) \ do { \ const char *__result = result; \ diff --git a/generic/tclTest.c b/generic/tclTest.c index 233387f..736d723 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -170,6 +170,15 @@ typedef struct TestChannel { static TestChannel *firstDetached; +#ifdef __GNUC__ +/* + * The rest of this file shouldn't warn about deprecated functions; they're + * there because we intend them to be so and know that this file is OK to + * touch those fields. + */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + /* * Forward declarations for procedures defined later in this file: */ |