474 Commits

Author SHA1 Message Date
miloyip
9974e35578 Merge conflicts and suppress VC warnings 2014-07-15 09:20:19 +08:00
Milo Yip
2d732794f0 Merge pull request #74 from miloyip/issue71endianness
Improves endian detection
2014-07-15 09:00:10 +08:00
Milo Yip
c5a4926b7a Merge pull request #67 from miloyip/issue66writerassertion
Fix #66 by adding Writer::Reset() and Writer::IsComplete()
2014-07-15 08:59:45 +08:00
thebusytypist
46e89dad0d Add unittests for kParserErrorTermination; Fix bugs in last merge. 2014-07-15 00:51:34 +08:00
thebusytypist
d4da07c5fb Merge upstream/master. 2014-07-14 23:49:57 +08:00
miloyip
d5218804bf More endian detection
Since __BYTE_ORDER__ only avaliable since GCC 4.6.0, add more detection.
2014-07-14 14:16:34 +08:00
miloyip
065e3b1628 Do not assume little endian when detection fail, add more detections 2014-07-14 13:54:15 +08:00
Milo Yip
a37a1881a5 Fixes missing supportUnicode in AutoUTF 2014-07-14 00:03:40 +08:00
Milo Yip
b5436f7104 Add ASCII encoding which can fulfill #69 2014-07-13 23:51:56 +08:00
Milo Yip
2e0b3de8d6 Minor update of SAX doc, add about IsComplete() and Reset() 2014-07-13 21:44:17 +08:00
Philipp A. Hartmann
d08eb7656f travis-doxygen.sh: only overwrite .git-credentials, iff not exists 2014-07-13 12:10:42 +02:00
Milo Yip
370aa88f2f Merge pull request #68 from pah/travis-ci
Fix uploading Doxygen documentation to GH pages from Travis CI
2014-07-13 18:07:59 +08:00
Milo Yip
e56028357d Merge remote-tracking branch 'origin/document' 2014-07-13 18:06:26 +08:00
Philipp A. Hartmann
8d8ce9e9c5 travis-doxygen.sh: don't ignore Doxygen push error 2014-07-13 11:54:24 +02:00
Philipp A. Hartmann
03834b5980 travis-doxygen.sh: directly setup .git-credentials
Instead of fiddling with the non-working GIT_ASKPASS/core.askpass
setup, simply store the required Git credentials directly in
~/.git-credentials, which is used by Git's "store" credential helper.

Works on https://travis-ci.org/pah/rapidjson.
2014-07-13 11:49:53 +02:00
Philipp A. Hartmann
4dafa2ac42 travis-doxygen.sh: try to explicitly implement an empty GIT_ASKPASS 2014-07-13 11:49:45 +02:00
Milo Yip
27101d9cd1 Add API doc for Writer::Reset() and Writer::IsComplete() 2014-07-13 13:27:15 +08:00
Milo Yip
5babae98e5 Add Writer::IsComplete() 2014-07-13 13:21:25 +08:00
Milo Yip
b234007713 Fixes #66 by adding Writer::Reset() and multiple root check
Note it redefines RAPIDJSON_ASSERT() to throw exception in unittest and
check for assertion with gtest.
2014-07-13 13:16:03 +08:00
Milo Yip
24a9cced45 Suppress VC2013 warning in capitalize 2014-07-13 12:04:37 +08:00
Milo Yip
4998f1ca9e Add capitalize example to sax documentation 2014-07-13 04:01:11 +08:00
Milo Yip
c203f682e9 Add capitalize example 2014-07-13 03:51:18 +08:00
Milo Yip
a73ed78fd6 Suppress effc++ warning in messagereader 2014-07-13 03:28:09 +08:00
Milo Yip
be478343a5 Update SAX documentation: writer, techniques 2014-07-13 03:21:38 +08:00
Philipp A. Hartmann
c1afdc8df2 travis-doxygen.sh: allow overriding GitHub repo from environment 2014-07-12 19:58:52 +02:00
Philipp A. Hartmann
2875b57616 Revert "Travis config trial: git config --global"
Avoids messing with global config when running the script
manually on a developer machine.

This reverts commit 6225092355e3087c3e73928f54cc1073c55067d6.
2014-07-12 19:58:52 +02:00
Philipp A. Hartmann
4575f93431 MacOS X doesn't have '/bin/true' 2014-07-12 19:58:52 +02:00
Milo Yip
a5c1324da9 Add messagereader example 2014-07-13 01:17:38 +08:00
Milo Yip
9e3ed44e85 Suppress VS2013 warnings due to #64 2014-07-13 01:10:25 +08:00
Milo Yip
8d70a8d03e Merge remote-tracking branch 'origin/master' 2014-07-13 01:06:30 +08:00
Milo Yip
e78654235f Revert "Add kParseErrorTermination English error message."
This reverts commit 025c516f827845c2510f761b203fce7ae3b669a1.
2014-07-13 01:06:22 +08:00
Milo Yip
cb3f213186 Merge pull request #64 from pah/feature/exception-support
Improve exception safety and add support for swtiching error handling to exceptions
2014-07-13 01:05:54 +08:00
Milo Yip
025c516f82 Add kParseErrorTermination English error message. 2014-07-13 01:00:03 +08:00
Philipp A. Hartmann
ff5713faf0 error/en.h: fix typo, add termination string 2014-07-12 18:45:49 +02:00
Philipp A. Hartmann
c69610239a error.h: add kParseErrorTermination (from #61) 2014-07-12 18:44:31 +02:00
Philipp A. Hartmann
152db11ad6 Merge branch 'upstream/master' into feature/exception-support
Conflicts:
	include/rapidjson/reader.h
2014-07-12 18:42:06 +02:00
Milo Yip
b55fcbd36a Merge pull request #61 from miloyip/issue59terminate
Fixes #59 by adding bool return value for each event handler function
2014-07-12 23:42:50 +08:00
Milo Yip
75cee948d4 Fixes main() return should be int in new examples 2014-07-12 23:41:01 +08:00
Milo Yip
05811e73d4 Update SAX documentation 2014-07-12 23:29:23 +08:00
Milo Yip
3c8a923439 Add simplereader, simplewriter examples.
Also modify premake to add all projects in example folder.
2014-07-12 23:07:41 +08:00
Milo Yip
6225092355 Travis config trial: git config --global 2014-07-12 18:42:26 +08:00
Milo Yip
ca05d85183 Revert "Travis config trial: using original name/email"
This reverts commit ded7dc723d0609111f5c2df0ff32eeaf0894b2d9.
2014-07-12 18:34:29 +08:00
Milo Yip
ded7dc723d Travis config trial: using original name/email 2014-07-12 18:30:19 +08:00
Milo Yip
75bee4cd76 Update token 2014-07-12 18:24:32 +08:00
Milo Yip
75d7bfe3be Revert "Update token"
This reverts commit fd9bc121553bfe1f9e7c3dd70918fe90350db799.
2014-07-12 18:24:13 +08:00
Milo Yip
fd9bc12155 Update token 2014-07-12 18:20:16 +08:00
Milo Yip
3096970720 Merge pull request #63 from pah/fixes/value-assign
GenericValue::operator= : fixup assignment operator (again)
2014-07-11 23:56:56 +08:00
Milo Yip
31113b4f52 Merge pull request #65 from pah/travis-ci
travis-ci.org: improve config, debug GH_TOKEN issue
2014-07-11 23:55:31 +08:00
Philipp A. Hartmann
33da6610f9 travis-doxygen.sh: temporarily ignore failing GH page update 2014-07-11 13:29:50 +02:00
Philipp A. Hartmann
5050f18743 travis-doxygen.sh: add GH_TOKEN sanity check 2014-07-11 13:20:18 +02:00