Gaurav
83ea25e5e2
Make OurFeatures ctor as default.
...
Please review suggested changes.
2015-09-23 09:42:26 +05:30
Christopher Dunn
5721f1ca57
Merge pull request #366 from ya1gaurav/patch-30
...
parseCommandLine also throws
2015-09-22 05:09:33 -05:00
Christopher Dunn
9942f6a1c7
Merge pull request #365 from ya1gaurav/patch-29
...
Remove conditional check for isMultiLine
2015-09-22 05:08:56 -05:00
Gaurav
6c14548293
parseCommandLine also throws
...
Catching exceptions thrown by parseCommandLine (std::bad_alloc & std::length_error) also.
2015-09-22 13:53:19 +05:30
Gaurav
6ee0bff822
Remove conditional check for isMultiLine
...
At all 3 places isMultiLine is checked in for loop :
for (int index = 0; index < size && !isMultiLine; ++index) {
It means !isMultiLine is always true (otherwise do not enter loop), so || condition does not depend on isMultiLine, so removed that.
2015-09-22 09:48:54 +05:30
Gaurav
e3b35992f8
Add default value of stackLimit couple of places
...
stackLimit default value is missing at two places.Adding them.
2015-09-21 18:05:15 +05:30
Christopher Dunn
cc5cdb565c
Merge pull request #348 from cdunn2001/override-keyword
...
C++11: override keyword
2015-09-05 12:12:37 -05:00
Gaurav
aadd0b1b63
C++11: override keyword
...
Source : http://en.cppreference.com/w/cpp/language/override
2015-09-05 12:03:38 -05:00
Christopher Dunn
3ee15b7bcc
Merge pull request #339 from Dani-Hub/master
...
Floating-point NaN or Infinity values should be allowed as a feature …
2015-09-05 11:59:54 -05:00
drgler
68509e6161
Fix number reading in the presence of Infinity: Only check for infinity if we have a leading sign character.
2015-09-05 14:49:33 +02:00
drgler
4cea1f6f6c
Adjust whitespace formatting
2015-09-05 14:48:29 +02:00
Daniel Krügler
6f9ed421d0
Merge pull request #2 from BillyDonahue/billy_danihub_fix
...
Billy danihub fix
2015-09-05 13:38:04 +02:00
Billy Donahue
7f7bbeff76
don't need out field of TestData
2015-09-05 04:22:18 -04:00
Billy Donahue
bfffe8cec7
prettier test
2015-09-05 04:07:56 -04:00
Billy Donahue
73154fb546
expanded Infinity test
2015-09-05 03:48:38 -04:00
drgler
63c747218b
Floating-point NaN or Infinity values should be allowed as a feature #209
...
Introduce 'allowSpecialFloats' for readers and 'useSpecialFloats' for writers, use consistent macro snprintf definition for writers and readers, provide new unit tests for #209
2015-09-03 22:50:03 +02:00
drgler
2084563efb
Floating-point NaN or Infinity values should be allowed as a feature #209
...
Introduce 'allowSpecialFloats' for readers and 'useSpecialFloats' for writers, use consistent macro snprintf definition for writers and readers, provide new unit tests for #209
2015-09-03 22:19:22 +02:00
Christopher Dunn
6329975e6d
Merge pull request #337 from AMDmi3/patch-1
...
Specify float constant as float
2015-08-21 20:45:37 -05:00
Dmitry Marakasov
7acfd599f0
Specify float constant as float
...
Otherwise, on some 32 bit platforms this may not fit into long and compilation will fail:
src/test_lib_json/main.cpp:1260: error: integer constant is too large for 'long' type
2015-08-21 21:19:26 +03:00
Robert Dailey
63a961a752
Clean up cmake END* (again)
...
(I missed a couple. ~cd)
2015-08-14 14:47:46 -07:00
Christopher Dunn
cb2378fa41
Merge pull request #332 from cdunn2001/END
...
Clean up cmake END*
2015-08-14 14:40:42 -07:00
Robert Dailey
37aaaec70e
Clean up cmake END*
...
* Clean up closing statements for if conditions, functions, macros,
and other entities. Newer versions of CMake do not require you to
redundantly respecify the parameters to the opening arguments.
2015-08-14 14:31:08 -07:00
Christopher Dunn
585446e6b3
Merge pull request #327 from cdunn2001/more-gitattributes
...
More gitattributes
2015-08-09 16:38:21 -07:00
Christopher Dunn
7f4be39e9f
add .gitattributes
...
helps #325
2015-08-09 16:25:36 -07:00
Christopher Dunn
47595e922b
normalized some windows VS stuff
2015-08-09 16:23:50 -07:00
Christopher Dunn
9f7dbcb19b
Merge pull request #326 from rcdailey/git-attributes
...
Introduce .gitattributes file and normalize line endings
2015-08-09 16:23:20 -07:00
Robert Dailey
c1996256d6
Normalize line endings
...
This commit contains nothing but line ending normalization
changes. These changes were performed after the introduction
of .gitattributes into the repository.
2015-08-09 18:02:52 -05:00
Robert Dailey
25e4adc4e1
Add .gitattributes file
2015-08-09 18:02:37 -05:00
Aaron Jacobs
cc2c15c3eb
Remove undefined behavior from a left shift of a negative value.
...
Fixed by shifting a positive value, then negating the result.
(Credit: Richard Trieu)
2015-08-03 10:58:29 +10:00
Christopher Dunn
912d55094d
Merge pull request #323 from joerg-krause/master
...
Remove -Werror
2015-08-02 15:48:38 -05:00
Jörg Krause
d7b84f69c5
Remove Werror
...
-Werror shouldn't be used in released code since it can cause random build
failures on moderate warnings. It also depends on the used toolchain since
different toolchains may or may not print the same warnings.
2015-07-30 23:56:28 +02:00
Christopher Dunn
9dad198af6
Merge pull request #320 from shields/negation-overflow
...
Fix cases where the most negative signed integer was negated, causing undefined behavior.
2015-07-28 11:35:52 -05:00
Michael Shields
7f06e9dc28
Fix cases where the most negative signed integer was negated, causing
...
undefined behavior.
2015-07-27 16:35:19 -07:00
Christopher Dunn
d84702c903
1.6.5
2015-07-23 00:26:13 -05:00
Christopher Dunn
949babd7b0
Exceptions declared in header
...
resolves #272
2015-07-23 00:26:13 -05:00
Christopher Dunn
6ed877c77c
correction for #316
2015-07-23 00:26:13 -05:00
Christopher Dunn
1c69568f8d
Merge pull request #316 from filipjs/master
...
Update json_tool.h
typo in a comment
2015-07-17 06:44:33 -05:00
filipjs
770fdda28b
Update json_tool.h
...
Fix a typo in comment.
2015-07-14 14:34:07 +02:00
Christopher Dunn
81cf237917
Merge pull request #314 from cdunn2001/master
...
-Werror
plus small bug-fix
2015-07-12 14:38:02 -05:00
Christopher Dunn
cac79543f8
1.6.4
...
minor bug-fix
2015-07-12 14:29:53 -05:00
Christopher Dunn
d8186f36a6
-Werror
2015-07-12 14:28:55 -05:00
Christopher Dunn
7f240623d3
fixed a bug found by -Wshadow
2015-07-12 14:28:55 -05:00
Christopher Dunn
784433ac72
fix some warnings
2015-07-12 14:28:37 -05:00
Christopher Dunn
7275e3ce3c
drop -Wsign-conversion
2015-07-12 12:49:57 -05:00
Christopher Dunn
46aa9d75fa
-Wconversion
...
* https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
* http://programmers.stackexchange.com/questions/122608/clang-warning-flags-for-objective-c-development/124574#124574
In clang: `-Wconversion` implies `-Wshorten-64-to-32`
2015-07-12 12:39:04 -05:00
Christopher Dunn
f94a0e8989
auto-generated file with minor update
2015-07-12 12:31:43 -05:00
Christopher Dunn
e22a2f36f7
Merge pull request #313 from cdunn2001/master
...
`-std=c++11` for gcc builds too
There was an issue with Travis, but we seem to be past that now.
We were using only -std=c++0x for gcc, as you can see in the diff.
resolves #134
2015-07-12 12:18:28 -05:00
Christopher Dunn
fac87108a4
-std=c++11 for gcc builds too
2015-07-12 12:08:34 -05:00
Christopher Dunn
14fc9f124e
Merge pull request #312 from cdunn2001/master
...
gcc-4.9, clang (3.0)
2015-07-12 12:04:41 -05:00
Christopher Dunn
658fa37e63
gcc-4.9, clang (3.0)
2015-07-12 11:53:49 -05:00