# Conflicts:
#	rapidjson/CMakeLists.txt
#	rapidjson/doc/Doxyfile.in
#	rapidjson/doc/Doxyfile.zh-cn.in
#	rapidjson/doc/internals.md
#	rapidjson/doc/stream.md
#	rapidjson/doc/stream.zh-cn.md
#	rapidjson/example/CMakeLists.txt
#	rapidjson/test/perftest/CMakeLists.txt
#	rapidjson/test/perftest/rapidjsontest.cpp
#	rapidjson/test/unittest/CMakeLists.txt
#	rapidjson/test/unittest/allocatorstest.cpp
#	rapidjson/test/unittest/pointertest.cpp
#	rapidjson/test/unittest/readertest.cpp
#	rapidjson/test/unittest/simdtest.cpp
#	rapidjson/test/unittest/valuetest.cpp
#	rapidjson/test/unittest/writertest.cpp

716f16b Merge pull request #544 from miloyip/optimization
6a6d9c7 Optimize Writer::WriteString() with SIMD
c974997 Merge pull request #541 from jschobben/issue507
995652e Add stream position check to reader unit tests
b20a9dc Merge branch 'issue341_float'
98ddfac Another try with volatile
58d8d9a Try fixing unit test in release configuration
746a996 Merge branch 'master' into issue341_float
e61169e Fix Value::GetFloat()
23e410b Merge pull request #540 from miloyip/issue341_float
8b4c999 Add Value::GetFloat(), Value::IsLossLessFloat/Double()
3cb5733 Merge pull request #539 from miloyip/issue538_regexzeromin
60116cf Support {0, } and {0, m} in Regex
3c2c162 Merge pull request #534 from miloyip/issue325
7e38386 Fix #533
964d89e Add encoding validation option for Writer/PrettyWriter
935e2ef Merge pull request #510 from miloyip/issue509_writingnaninf
f9d0f65 Fix compilation
ab250d2 Rectify parsing error offsets
3771188 Merge pull request #532 from miloyip/issue529
cec8dcb Add optional unresolvedTokenIndex parameter to Pointer::Get() and related
ef36794 Merge pull request #531 from miloyip/jsonx
5af344b Add comment for -D__STDC_FORMAT_MACROS
e702d3d Merge pull request #530 from miloyip/iostream
b5d939b Fix a gcc warning
c53a836 Try fixing 64-bit printf macro
9f1dcef Add jsonx example
953dd5a Fix OStreamWrapper test
0f7cb31 Update Stream.md
562549f Disable copy/assignment for stream wrappers
c3133de Renamed IStreamWrapper/OStreamWrapper
b9bca8e Add OStreamWrapper
ec81cc3 Fix a IStreamWrapper test with incorrect type
67945ef Disable including codecvt in tests as many libraries does not support it yet.
43b63b1 Add IStreamWrapper
c828037 Make a stackoverflow solution
7c72640 Improve reader coverage for insitu parsing
cefae77 Fix gcc warning
021d746 Fix warning
d258f59 Add SIMD ScanCopyUnescapedString test
28f11ac Fix schema performance stats
b8a2737 Improve comment parsing code coverage
efe4140 Fix #399 MemoryPoolAllocator::Realloc expands fail
d43f001 Fix #472 Template specialization failure with SunOS compiler
3edf0b4 Minor doc fix
29016f3 Add notes about SIMD optimization issue. [skip ci]
7787c44 Fix again
f422094 Fix the last warning fix
5f819ea Fix warnings
8cb978d Add fwd.h and extract stream.h
0cf0644 Merge pull request #522 from miloyip/schema
dd2076f Minor refactoring
ba7aa97 Refactoring: Remove GenericSchemaValiadator::nullOutputHandler_
02ea9f9 Refactor: remove unncessary template member functions
f9d1e42 Refactoring: remove GenericSchemaDocument::document_
13ee68c Add API doc for schema
8876d9e Fix regex doc [ci skip]
4daade9 Add Chinese translation of schema [ci skip]
267fcd1 Add TOC [skip ci]
84a26e5 Fix incorrect escape characters in doc [skip ci]
a79d689 Minor edits of schema.md [ci skip]
3184e89 Draft schema documentation
55d2867 Add SchemaValidatingReader ::IsValid()
28e6a40 Change indentation to space
48e0675 Fix gcc warning
556a897 Add RAPIDJSON_UNLIKELY in Value::Accept()
b515627 CMake use RelWithDebInfo as default #319
b8b7dfe Fix partial specialization issue
ed12665 Fix compilation error for gcc/clang
a33af83 Optimization for Regex and Schema
a006648 Update json schema suite and add perf test
89106a1 Add schema validator example
4ce000b Fix out-of-bound access
ea62c64 Fix clang warning
63ae3b7 Fix memory leak
d72f52b Fix clang warning
05968b7 Fix schema tests and added SchemaValidatingReader
6978f87 Resolve conflicts
7f9921f Merge branch 'master' into schema
74f0673 Merge branch 'master' into schema
c5de8b2 For diagnosis valgrind issue in travis
d4d03ca Use internal regex as default in schema validator
b8d2f7e Merge regex into schema
a8feeb4 Add invalid regex tests and fix a bug
c0e7c83 Fix a bug and add document in regex
3eb19ce Add Search(), ^ and $ assertions to regex
a5ac3b5 Remove an unused line of code
960bc0e Fix gcc warning
56b2052 Refactor to store minIndex in Frag of regex
fa7dc1c Add numbered quantifier
51bb763 Refactor regex with DecodedStream with one look-ahead character
0dffe87 Add character class escapes
92285be Add escape characters and control characters
1784afe Add character class to regex
06853b8 Add any character (.) to regex
3c9ceb3 Add doxygen notes for regex
0934803 Add Unicode regex test
328b0d8 Minor refactor regex
994b0df Clean up regex
a386934 Add ?*+ to regex
05c7989 Add parenthesis support in regex
0bef29a Initial reggae implementation with only concatenation and alternation
3ffac19 Fix compilation in schema test
85c8b65 Achieve zero heap allocation for SchemaValidator.TestSuite
e20645f Add optional allocator for Pointer default/copy constructor
a4cbd3f Refactor SchemaValidator.TestSuite to use MemoryPoolAllocator explicitly
3919348 Refactor hasher construction
69c58b5 Use state allocator for all context states
87d1f95 Use state allocator for creating parallel validators
7ef7ba1 Refactor: aggregate parallel validators
5e220bb Change schema literal strings to Value type, eliminates StrLen()
a92c3b6 Make schema working for UTF-16 and other encodings
332c226 Remove Schema::Property::typeless member variable
4335a62 Merge remote-tracking branch 'origin/master' into schema
9acea17 Fix nested ref
5b6061c Fix meta schema validation
11f666a Add more verbose info
371b928 Refactor move pointer into schema
d452a54 Add verbose output for schema diagnosis
84d7405 Fix memory bugs
0fb2b80 Change $ref handling mechnism
e0a8a32 Add meta schema test (failing now)
979088d Add 64-bit integer schema validations
1a59ab5 Add invalid schema keyword
a326c68 Merge branch 'master' into schema
5bc9523 Add invalid schema/document pointers
6b7e7d7 Fix gcc warning
8c25840 Fix Document.UserBuffer test
544e26c Increase user buffer in documents
f788702 Fix compilation error
3f1e2c4 Use allocator in SchemaDocument
c54b7fa Change Document::ParseStream() to use stack allocator for Reader
69414cb Fix MemoryPoolAllocator::Clear() to clear user-buffer
01393e0 Add uniqueItems in schema
aeb5bda Use Hasher to match enum in schema
573faa9 Try to fix a gcc warning
74300ac Add Hasher::IsValid()
c040d26 Disable printing hash code
8209077 Try to fix effc++ warning
1af660c Add hasher
8f5405a Fix compilation error
44fbf9c Add meta schema file
3873bcb Fix some remote ref issues
42f1194 Add remote reference
ed7e9bc Refactor template parameters in schema
4a0b591 Move private schema classes into internal namespace
422aebf Clean up schema
f0c3fa8 Add Ref in schema
1e4a381 Centralise schema ownership to SchemaDocument
a576a0f Merge branch 'master' into schema
74f1bc5 Add schema map in SchemaDocument
0e4c368 Merge branch 'master' into schema
677af55 Merge remote-tracking branch 'origin/master' into schema
24f060f Refactor template parameters and add ISchemaValidator
a5eabe8 Rename classes in schema
5f548ac Fix a bug related to if block
dec1225 Fix warning and runtime delete error.
fff931b Fix another compilation error
09530ad Fix compilation
490630b Readd RAPIDJSON_SCHEMA_HAS_REGEX and fix compilation
6b3244e Remove RAPIDJSON_SCHEMA_HAS_REGEX
314ee22 Add multiple patternProperties match
3d3555d Use move semantics for property name
242d67f Handle all properties in schema
e9dd5ff Add schema dependencies (not handling missing property)
9e907ea Remove unused multiTypeSchema
761561a Fix clang compilation and a memory leak
1948fb5 Fix multipleOf in schema tests
e33049d Fix minLength & maxLength with code point instead of code unit
9c0e409 Fix "additional items do not match schema"
f19a1b6 Fix clang errors/warnings
bbbd1c6 Schema code simplification
838e29f Remove polymorphism in schema
a274063 Massive refactoring of schema
a30a641 Fix warnings
ca2061a Turn off some not-yet-implemented test cases, and fix a few
5ad3639 Add Json Schema Test Suite
15c712d Attempt to make correct implementation of logic combiners
d6871c3 Fix warnings
eb7d02b Add anyOf, oneOf and not in schema (buggy)
1062f0a Add allOf in schema
c2649a3 Disable patternProperties tests when no regex
efc1932 Travis gcc/clang versions cannot support C++11 well
d5c2f2e Add patternProperties in schema
8366bb8 Add string pattern in schema
87adfd4 Merge remote-tracking branch 'origin/master' into schema
a5d700e Implemented property dependencies of schema
c629d37 Simplify FindMember() in schema
0713b89 Implement Multi-type
e0c26e4 Fix the test, and refactor to simplify
ae645a2 Fix a bug in additionalItems
602f875 Add a failed case
05ae593 Implement additionalItems
33b5c59 Fix some gcc warnings/errors
9a5283e Fix mismatched delete
5c93e64 Fix clang compilation
c1bcccb Very basic JSON schema implementation

git-subtree-dir: rapidjson
git-subtree-split: 716f16b1374e38596ed17664c22f4a96485b82be

Use Release config by default and turn on SIMD if support

This reverts commit 0a6c198b.

4f20bdc Merge pull request #515 from miloyip/cxx11warnings
4031150 Add travis C++11 on/off matrix
a749040 Try to fix a clang missing assignment warning
d8c793f Disable type_traits
2f5a69b Try using c++0x for gcc 4.6.x
a6eb15d Fix warnings in clang for C++11
534da22 Merge branch 'master' into cxx11warnings
968a666 Merge pull request #513 from miloyip/optimization
f183282 Fix warning
a202d82 Make whitespace array more compact
4f4aff3 Fix clang compilation
a5990f3 Optimize ScanCopyUnescapedString for insitu parsing
f13caad Fix valgrind problem
e392652 Fix compilation
d1e6eae Remove unused code
6863f7b Fix warning
ae5cf58 Fix ScanCopyUnescapedString performance issue
1502e7e Merge branch 'master' into optimization
69d0f41 Implemented ScanCopyUnescapeString optimization
66f99d2 Merge pull request #511 from ReadmeCritic/master
292a5c9 Update README URLs based on HTTP redirects
8fbe442 Merge pull request #510 from miloyip/issue509_writingnaninf
78c7d54 Fix #498 VC2015 warnings
bab80e7 Fix clang warning
ad1d22e Fix #509 by checking Nan/Inf when writing a double
44f81f0 Remove travis doc job number checking.
bd1be76 Fix #508 tutorial documentation about move semantics.
df76c0d Apply LIKELY/UNLIKELY in Reader
122c722 More LIKELY/UNLIKELY in Writer
bcc3fb6 Fix stack reserve bug
ef6957c PutReserve() and PutUnsafe() optimisation for Writer
1a21379 Merge branch 'master' into optimization
f7a64c5 Add RAPIDJSON_LIKELY/UNLIKELY and apply them in stack
adb7d17 Fix warnings for misctest

git-subtree-dir: rapidjson
git-subtree-split: 4f20bdcf39ecb607699661be414ec11ea9cfc3e7