Tcl Source Code

Artifact [86431d8501]
Login

Artifact 86431d850103e384cfd11f59ee64b3e7b3442c1e:

Attachment "tclOO20080113.patch" to ticket [1870456fff] added by kennykb 2008-01-14 01:44:25.
? nsk1200002852B
Index: generic/tclOOCall.c
===================================================================
RCS file: /cvsroot/tcl/oocore/generic/tclOOCall.c,v
retrieving revision 1.7
diff -b -u -r1.7 tclOOCall.c
--- generic/tclOOCall.c	9 Jan 2008 10:11:53 -0000	1.7
+++ generic/tclOOCall.c	13 Jan 2008 03:16:01 -0000
@@ -40,21 +40,23 @@
  * Function declarations for things defined in this file.
  */
 
-static void		AddClassFiltersToCallContext(Object *oPtr,
-			    Class *clsPtr, struct ChainBuilder *cbPtr,
-			    Tcl_HashTable *doneFilters);
-static void		AddClassMethodNames(Class *clsPtr, int flags,
-			    Tcl_HashTable *namesPtr);
+static void		AddClassFiltersToCallContext(Object *const oPtr,
+			    Class *clsPtr, struct ChainBuilder *const cbPtr,
+			    Tcl_HashTable *const doneFilters);
+static void		AddClassMethodNames(Class *clsPtr, const int flags,
+			    Tcl_HashTable *const namesPtr);
 static inline void	AddMethodToCallChain(Method *mPtr,
 			    struct ChainBuilder *cbPtr,
 			    Tcl_HashTable *doneFilters, Class *filterDecl);
 static inline void	AddSimpleChainToCallContext(Object *oPtr,
-			    Tcl_Obj *methodNameObj, struct ChainBuilder *cbPtr,
+			    Tcl_Obj *methodNameObj,
+			    struct ChainBuilder *cbPtr,
 			    Tcl_HashTable *doneFilters, int isPublic,
 			    Class *filterDecl);
 static void		AddSimpleClassChainToCallContext(Class *classPtr,
-			    Tcl_Obj *methodNameObj, struct ChainBuilder *cbPtr,
-			    Tcl_HashTable *doneFilters, int isPublic,
+			    Tcl_Obj *const methodNameObj,
+			    struct ChainBuilder *const cbPtr,
+			    Tcl_HashTable *const doneFilters, int isPublic,
 			    Class *filterDecl);
 static int		CmpStr(const void *ptr1, const void *ptr2);
 static void		InitClassHierarchy(Foundation *fPtr, Class *classPtr);
@@ -435,7 +437,7 @@
 	 * dealing with public method names.
 	 */
 
-	qsort(strings, (unsigned) i, sizeof(char *), CmpStr);
+	qsort((void*)strings, (unsigned) i, sizeof(char *), CmpStr);
 	*stringsPtr = strings;
     }
 
Index: generic/tclOOInt.h
===================================================================
RCS file: /cvsroot/tcl/oocore/generic/tclOOInt.h,v
retrieving revision 1.16
diff -b -u -r1.16 tclOOInt.h
--- generic/tclOOInt.h	3 Jan 2008 15:06:57 -0000	1.16
+++ generic/tclOOInt.h	13 Jan 2008 03:13:25 -0000
@@ -362,7 +362,7 @@
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const *objv);
 MODULE_SCOPE int	TclOODefineMixinObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
+			    Tcl_Interp *interp, const int objc,
 			    Tcl_Obj *const *objv);
 MODULE_SCOPE int	TclOODefineSuperclassObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
Index: win/TclOO.rc
===================================================================
RCS file: /cvsroot/tcl/oocore/win/TclOO.rc,v
retrieving revision 1.1
diff -b -u -r1.1 TclOO.rc