Skip to content

Testing #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnnyduo wants to merge 28 commits into
base: experimental
Choose a base branch
from
Open

Testing #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2e6ccf4
When commiting the fix for hash % dictionary->capacity, some local, i…
johnezang Mar 31, 2011
862fa4d
Fixes a bug when removing items from a JKDictionary. Since JKDiction…
johnezang Apr 22, 2011
e1cb174
Change a NSException from exceptionWithName: to raise:. Closes #20.
johnezang Apr 25, 2011
b8359c6
Adds a serializing option to backslash escape forward slashes. This …
johnezang May 2, 2011
0ef031d
Pacify Xcode 4.1.
May 4, 2011
7e4d3ec
Merge pull request #22 from jordanbreeding/master
johnezang May 5, 2011
f403357
Workarounds for issue #19 (the clang stuff) and issue #23. For issue…
johnezang May 21, 2011
353b124
Added cocoanetics JSON comparison.
johnezang May 21, 2011
cab1ea8
Moved the +load logic from JSONDecoder in to jk_collectionClassLoadTi…
johnezang May 21, 2011
2efa7e6
Fix typo.
johnezang May 22, 2011
df39818
Fixes issue gh-29, license descrepency between README.md and JSONKit.…
johnezang Jun 3, 2011
ac07028
Added "JKSerializeOptionEscapeForwardSlashes". Changed a number of <…
johnezang Jun 5, 2011
601588e
Minor tweak.
johnezang Jun 5, 2011
4656c2d
Minor tweak to the minor tweak.
johnezang Jun 5, 2011
c2146ff
Added note about Automatic Reference Counting (ARC) to README.md and …
johnezang Jun 16, 2011
c34c374
Use memcmp() instead of strncmp() to compare cache buckets.
jparise Aug 31, 2011
3624e0f
Fix ambiguous method (initWithObjects:count:) compilation errors unde…
atnan Sep 22, 2011
6d3938e
Merge pull request #50 from atnan/fixclang2errors
johnezang Sep 22, 2011
660546f
Merge pull request #46 from jparise/cache-collisions
johnezang Sep 23, 2011
c2ef692
Fixes issues #9, #15, #40, aka "crashes on 64-bit Lion / 10.7 ABI".
johnezang Sep 23, 2011
c494f8d
Surpress "multiple methods named" error
soffes Nov 17, 2011
395ab9a
Changed cast to NSDictionary per John's request
soffes Nov 17, 2011
e3f9017
Merge pull request #58 from samsoffes/master
johnezang Nov 17, 2011
2388b6f
Updated README.md with benchmark information for NSJSONSerialization.
johnezang Dec 18, 2011
0aff3de
Merge branch 'master' of github.com:johnezang/JSONKit
johnezang Dec 18, 2011
02b983f
Minor changes to hashing and cache aging algorithms.
johnezang Mar 22, 2012
5663f2d
Silences some warnings that newer versions of the compiler(s) complai…
johnezang Jun 24, 2012
8215763
Add a `#ifdef` to silence a `clang` static analyzer false positive wa…
johnezang Jul 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions JSONKit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,11 @@ enum {
typedef JKFlags JKParseOptionFlags;

enum {
JKSerializeOptionNone = 0,
JKSerializeOptionPretty = (1 << 0),
JKSerializeOptionEscapeUnicode = (1 << 1),
JKSerializeOptionValidFlags = (JKSerializeOptionPretty | JKSerializeOptionEscapeUnicode),
JKSerializeOptionNone = 0,
JKSerializeOptionPretty = (1 << 0),
JKSerializeOptionEscapeUnicode = (1 << 1),
JKSerializeOptionEscapeForwardSlashes = (1 << 4),
JKSerializeOptionValidFlags = (JKSerializeOptionPretty | JKSerializeOptionEscapeUnicode | JKSerializeOptionEscapeForwardSlashes),
};
typedef JKFlags JKSerializeOptionFlags;

Expand Down
Loading