Changeset 7692efc in git for external/tcl/tclInt.h

Timestamp:

Aug 16, 2019, 11:14:50 AM (5 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, master

Children:

0e7d64a

Parents:

94f8f5f (diff), 270bd4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:delphes/delphes

File:

• external/tcl/tclInt.h (modified) (6 diffs)

external/tcl/tclInt.h

@@ -1326 +1326 @@
 
 extern Tcl_Obj *        tclFreeObjList;
-
-#ifdef TCL_COMPILE_STATS
-extern long             tclObjsAlloced;
-extern long             tclObjsFreed;
-#endif /* TCL_COMPILE_STATS */
 
 /*
@@ -1445 +1440 @@
                             int objc, Tcl_Obj *CONST objv[], int flags));
 EXTERN char *           TclpAlloc _ANSI_ARGS_((unsigned int size));
-
+EXTERN void             TclpFree(char *cp);
 EXTERN char *           TclpRealloc _ANSI_ARGS_((char *ptr,
                             unsigned int size));
@@ -1472 +1467 @@
 EXTERN int              TclPreventAliasLoop _ANSI_ARGS_((Tcl_Interp *interp,
                             Tcl_Interp *cmdInterp, Tcl_Command cmd));
-EXTERN void             TclPrintByteCodeObj _ANSI_ARGS_((Tcl_Interp *interp,
-                            Tcl_Obj *objPtr));
 EXTERN void             TclProcCleanupProc _ANSI_ARGS_((Proc *procPtr));
 EXTERN int              TclProcCompileProc _ANSI_ARGS_((Tcl_Interp *interp,
@@ -1688 +1681 @@
  */
 
-#ifdef TCL_COMPILE_STATS
-#  define TclIncrObjsAllocated() \
-    tclObjsAlloced++
-#  define TclIncrObjsFreed() \
-    tclObjsFreed++
-#else
-#  define TclIncrObjsAllocated()
-#  define TclIncrObjsFreed()
-#endif /* TCL_COMPILE_STATS */
-
-#ifdef TCL_MEM_DEBUG
-#  define TclNewObj(objPtr) \
-    (objPtr) = (Tcl_Obj *) Tcl_DbCkalloc(sizeof(Tcl_Obj), __FILE__, __LINE__); \
-    (objPtr)->refCount = 0; \
-    (objPtr)->bytes    = tclEmptyStringRep; \
-    (objPtr)->length   = 0; \
-    (objPtr)->typePtr  = NULL; \
-    TclIncrObjsAllocated()
-#  define TclDbNewObj(objPtr, file, line) \
-    (objPtr) = (Tcl_Obj *) Tcl_DbCkalloc(sizeof(Tcl_Obj), (file), (line)); \
-    (objPtr)->refCount = 0; \
-    (objPtr)->bytes    = tclEmptyStringRep; \
-    (objPtr)->length   = 0; \
-    (objPtr)->typePtr  = NULL; \
-    TclIncrObjsAllocated()
-#  define TclDecrRefCount(objPtr) \
-    if (--(objPtr)->refCount <= 0) { \
-        if ((objPtr)->refCount < -1) \
-            panic("Reference count for %lx was negative: %s line %d", \
-                  (objPtr), __FILE__, __LINE__); \
-        if (((objPtr)->bytes != NULL) \
-                && ((objPtr)->bytes != tclEmptyStringRep)) { \
-            ckfree((char *) (objPtr)->bytes); \
-        } \
-        if (((objPtr)->typePtr != NULL) \
-                && ((objPtr)->typePtr->freeIntRepProc != NULL)) { \
-            (objPtr)->typePtr->freeIntRepProc(objPtr); \
-        } \
-        ckfree((char *) (objPtr)); \
-        TclIncrObjsFreed(); \
-    }
-#else /* not TCL_MEM_DEBUG */
 #  define TclNewObj(objPtr) \
     if (tclFreeObjList == NULL) { \
@@ -1740 +1691 @@
     (objPtr)->bytes    = tclEmptyStringRep; \
     (objPtr)->length   = 0; \
-    (objPtr)->typePtr  = NULL; \
-    TclIncrObjsAllocated()
+    (objPtr)->typePtr  = NULL;
 #  define TclDecrRefCount(objPtr) \
     if (--(objPtr)->refCount <= 0) { \
@@ -1754 +1704 @@
         (objPtr)->internalRep.otherValuePtr = (VOID *) tclFreeObjList; \
         tclFreeObjList = (objPtr); \
-        TclIncrObjsFreed(); \
     }
-#endif /* TCL_MEM_DEBUG */
 
 /*