Merge pull request #3575 from vishalduggal/timob-12012

[TIMOB-12012] Revert fixes from PR 2839
tidev · Dec 11, 2012 · ecdb9b6 · ecdb9b6
2 parents 0ea395e + 10c4bff
commit ecdb9b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apidoc/Titanium/Database/ResultSet.yml b/apidoc/Titanium/Database/ResultSet.yml
@@ -136,7 +136,7 @@ properties:
     summary: The number of columns in this result set.
     type: Number
     permission: read-only
-    platforms: [android, iphone, ipad]
+    platforms: [android]
 
   - name: rowCount
     summary: The number of rows in this result set.

diff --git a/iphone/Classes/TiDatabaseResultSetProxy.m b/iphone/Classes/TiDatabaseResultSetProxy.m
@@ -199,7 +199,7 @@ -(id)fieldName:(id)args
 	return nil;
 }
 
--(NSNumber*)fieldCount
+-(NSNumber*)fieldCount:(id)unused
 {
 	if (results!=nil)
 	{