From 2a36240c713f132ba78917496b237d879d5e2d58 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Thu, 28 Jan 2010 13:57:47 +0000
Subject: Make things compile... D'oh!

---
 generic/tclOO.c      | 4 ++--
 generic/tclOOBasic.c | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/generic/tclOO.c b/generic/tclOO.c
index a428aba..ea008be 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclOO.c,v 1.27 2010/01/28 10:25:04 dkf Exp $
+ * RCS: @(#) $Id: tclOO.c,v 1.28 2010/01/28 13:57:47 dkf Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -575,7 +575,7 @@ AllocObject(
 	cmdPtr->nreProc = PrivateNRObjectCmd;
 	Tcl_SetHashValue(cmdPtr->hPtr, cmdPtr);
 	oPtr->myCommand = (Tcl_Command) cmdPtr;
-	cmdPtr->tracePtr = trace = (CommandTrace *)
+	cmdPtr->tracePtr = tracePtr = (CommandTrace *)
 		ckalloc(sizeof(CommandTrace));
 	tracePtr->traceProc = MyDeletedTrace;
 	tracePtr->clientData = oPtr;
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index eedbf5a..193ca93 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclOOBasic.c,v 1.21 2010/01/28 10:25:05 dkf Exp $
+ * RCS: @(#) $Id: tclOOBasic.c,v 1.22 2010/01/28 13:57:48 dkf Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -268,13 +268,15 @@ TclOO_Object_Destroy(
 	return TCL_ERROR;
     }
     if (!(oPtr->flags & DESTRUCTOR_CALLED)) {
-	CallContext *contextPtr = TclOOGetCallContext(oPtr, NULL, DESTRUCTOR);
+	CallContext *contextPtr =
+		TclOOGetCallContext(oPtr, NULL, DESTRUCTOR, NULL);
 
 	oPtr->flags |= DESTRUCTOR_CALLED;
 	if (contextPtr != NULL) {
 	    contextPtr->callPtr->flags |= DESTRUCTOR;
 	    contextPtr->skip = 0;
-	    result = TclOOInvokeContext(interp, contextPtr, 0, NULL);
+	    result = Tcl_NRCallObjProc(interp, TclOOInvokeContext,
+		    contextPtr, 0, NULL);
 	    TclOODeleteContext(contextPtr);
 	}
     }
-- 
cgit v0.12