Merge branch 'master' of https://github.com/jcbertin/JSONKit into jcbertin-master

Author: ioue

.gitignore

@@ -0,0 +1 @@
+.svn

JSONKit/JSONKit.h

@@ -95,6 +95,9 @@ typedef unsigned int   NSUInteger;
 #ifndef _JSONKIT_H_
 #define _JSONKIT_H_
 
+// You can define JK_REMOVE_DEPRECATED to remove all deprecated stuff
+//#define JK_REMOVE_DEPRECATED
+	
 #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__APPLE_CC__) && (__APPLE_CC__ >= 5465)
 #define JK_DEPRECATED_ATTRIBUTE __attribute__((deprecated))
 #else
@@ -148,12 +151,14 @@ typedef struct JKParseState JKParseState; // Opaque internal, private type.
 - (id)initWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
 - (void)clearCache;
 
+#ifndef JK_REMOVE_DEPRECATED
 // The parse... methods were deprecated in v1.4 in favor of the v1.4 objectWith... methods.
 - (id)parseUTF8String:(const unsigned char *)string length:(size_t)length                         JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4.  Use objectWithUTF8String:length:        instead.
 - (id)parseUTF8String:(const unsigned char *)string length:(size_t)length error:(NSError **)error JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4.  Use objectWithUTF8String:length:error:  instead.
 // The NSData MUST be UTF8 encoded JSON.
 - (id)parseJSONData:(NSData *)jsonData                                                            JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4.  Use objectWithData:                     instead.
 - (id)parseJSONData:(NSData *)jsonData error:(NSError **)error                                    JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4.  Use objectWithData:error:               instead.
+#endif
 
 // Methods that return immutable collection objects.
 - (id)objectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length;