[PyObjC-svn] r2404 - in trunk/pyobjc/pyobjc-framework-Cocoa: Modules PyObjCTest

Author: ronaldoussoren
Date: Thu Feb  4 08:12:52 2010
New Revision: 2404

Log:
- Fix 64-bit issues in NSCoder support.
- Remove dead 'mod_doc' definition from _Foundation_typecode.m


Modified:
   trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_Foundation_nscoder.m
   trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_Foundation_typecode.m
   trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nscoder.py

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_Foundation_nscoder.m
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_Foundation_nscoder.m	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_Foundation_nscoder.m	Thu Feb  4 08:12:52 2010
@@ -177,7 +177,7 @@
 
 	PyObjC_DURING
 		if (PyObjCIMP_Check(method)) {
-			((void(*)(id,SEL, char*,int, void*))
+			((void(*)(id,SEL, char*,NSUInteger, void*))
 				(PyObjCIMP_GetIMP(method)))(
 					PyObjCObject_GetObject(self),
 					PyObjCIMP_GetSelector(method),
@@ -189,7 +189,7 @@
 
 			(void)objc_msgSendSuper(&super,
 					PyObjCSelector_GetSelector(method),
-					signature, count, buf);
+					signature, (NSUInteger)count, buf);
 		}
 	PyObjC_HANDLER
 		PyObjCErr_FromObjC(localException);
@@ -425,7 +425,7 @@
 
 	PyObjC_DURING
 		if (PyObjCIMP_Check(method)) {
-			((void(*)(id,SEL, char*,int, void*))
+			((void(*)(id,SEL, char*,NSUInteger, void*))
 				(PyObjCIMP_GetIMP(method)))(
 					PyObjCObject_GetObject(self),
 					PyObjCIMP_GetSelector(method),
@@ -437,7 +437,7 @@
 
 			(void)objc_msgSendSuper(&super,
 				PyObjCSelector_GetSelector(method),
-				signature, count, buf);
+				signature, (NSUInteger)count, buf);
 		}
 	PyObjC_HANDLER
 		PyObjCErr_FromObjC(localException);
@@ -559,7 +559,7 @@
 
 	struct objc_super super;
 
-	if  (!PyArg_ParseTuple(arguments, "t#i", &bytes, &size, &length)) {
+	if  (!PyArg_ParseTuple(arguments, "t#"Py_ARG_SIZE_T, &bytes, &size, &length)) {
 		return NULL;
 	}
 
@@ -668,17 +668,17 @@
 
 	PyObjC_DURING
 		if (PyObjCIMP_Check(method)) {
-			bytes = ((void*(*)(id,SEL,int*))
+			bytes = ((void*(*)(id,SEL,NSUInteger*))
 				(PyObjCIMP_GetIMP(method)))(
 					PyObjCObject_GetObject(self),
 					PyObjCIMP_GetSelector(method),
-					(int *)&size);
+					&size);
 		} else {
 			PyObjC_InitSuper(&super, 
 				PyObjCSelector_GetClass(method),
 				PyObjCObject_GetObject(self));
 
-			bytes = (void*)objc_msgSendSuper(&super,
+			bytes = ((void*(*)(struct objc_super*,SEL,NSUInteger*))objc_msgSendSuper)(&super,
 				PyObjCSelector_GetSelector(method),
 				&size);
 		}
@@ -842,7 +842,7 @@
 				PyObjCSelector_GetClass(method),
 				PyObjCObject_GetObject(self));
 
-			bytes = (void*)objc_msgSendSuper(&super,
+			bytes = ((void*(*)(struct objc_super*,SEL,id,NSUInteger*))objc_msgSendSuper)(&super,
 				PyObjCSelector_GetSelector(method),
 				key,
 				&size);
@@ -1013,7 +1013,7 @@
 
 			(void)objc_msgSendSuper(&super,
 				PyObjCSelector_GetSelector(method),
-				bytes, size, key);
+				bytes, (NSUInteger)size, key);
 		}
 	PyObjC_HANDLER
 		PyObjCErr_FromObjC(localException);

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_Foundation_typecode.m
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_Foundation_typecode.m	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_Foundation_typecode.m	Thu Feb  4 08:12:52 2010
@@ -77,8 +77,6 @@
 	return PyMac_BuildOSType(hfsTypeCode);
 }
 
-PyDoc_STRVAR(mod_doc, "");
-
 #define FOUNDATION_TYPECODE_METHODS				\
 	{ 							\
 		"NSFileTypeForHFSTypeCode", 			\

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nscoder.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nscoder.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_nscoder.py	Thu Feb  4 08:12:52 2010
@@ -6,7 +6,6 @@
 
 class TestNSCoderUsage(TestCase):
     def testUsage(self):
-        self.fail("FIXME 64")
         class CoderClass1 (NSObject):
             def encodeWithCoder_(self, coder):
                 # NSObject does not implement NSCoding, no need to

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com