generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-25 21:24:05 +02:00
Code Issues Projects Releases Wiki Activity
791 Commits 4 Branches 55 Tags
Commit Graph

371 Commits

Author SHA1 Message Date
Gaurav
aec261a899 NORETURN for throw functions in 0.x.y branch 
Added in definition also.
 2016-03-16 11:23:36 +05:30
Benjamin Knecht
0fc51120c0 Add test code for precision 
Conflicts:
	src/test_lib_json/main.cpp
 2016-02-06 09:32:31 -06:00
Benjamin Knecht
4a984c24b5 making precision unsigned int 
adding precision as settings value for StreamBuilder

Conflicts:
	src/lib_json/json_writer.cpp
 2016-02-06 09:32:30 -06:00
Benjamin Knecht
2f9a6a682c Create format string with sprintf. 
For now use hardcoded precision '17' for now
 2016-02-06 09:32:30 -06:00
Christopher Dunn
e105003bb5 gcc-6 lacks auto_ptr<> 2016-02-06 08:24:20 -06:00
Christopher Dunn
dde8426ded 0001-multiarch-path-support.patch 2016-02-06 08:10:54 -06:00
Christopher Dunn
eec6794106 fix-double-parsing.patch 2016-02-06 08:03:34 -06:00
Christopher Dunn
a4354d782b Merge pull request #339 from Dani-Hub/master 
Floating-point NaN or Infinity values should be allowed as a feature …
 2015-09-05 12:16:28 -05:00
Christopher Dunn
a7b80fea65 Merge pull request #337 from AMDmi3/patch-1 
Specify float constant as float
 2015-09-05 12:08:45 -05:00
Robert Dailey
8bdb07dd52 Clean up cmake END* (again) 
(I missed a couple. ~cd)
 2015-08-14 14:48:45 -07:00
Robert Dailey
22dade5c97 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:42:55 -07:00
Aaron Jacobs
22ec823cc7 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-09 11:05:22 -07:00
Michael Shields
1b32e3e869 Fix cases where the most negative signed integer was negated, causing 
undefined behavior.
 2015-08-09 11:04:09 -07:00
Christopher Dunn
18e4d04e8e merged from 1.6.5 2015-07-23 00:32:47 -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
filipjs
770fdda28b Update json_tool.h 
Fix a typo in comment.
 2015-07-14 14:34:07 +02:00
Christopher Dunn
542354902e fixed a bug found by -Wshadow 2015-07-12 14:47:37 -05:00
Christopher Dunn
17360f3d4b fix some warnings 2015-07-12 14:47:37 -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
Stuart Eichert
cb8259f545 Fix #296: Explicitly cast size_t results to unsigned when needed 
This is rebased from #297, where AppVeyor had been failing, and which
was not properly based on the master branch.
 2015-07-11 13:52:27 -05:00
Martyn Gigg
710260d070 Allow an optional suffix on the debug library name in CMake. 2015-07-11 13:51:40 -05:00
Christopher Dunn
2428889813 1.6.3 2015-07-11 13:41:13 -05:00
Gaurav
ef38374e99 Gcc warning unused "tokenStart" 
(was #301)

In `0.y.z` branch, `tokenStart` is not used.
Comment it as done in other cases.
 2015-07-11 11:57:21 -05:00
Stuart Eichert
702a539762 Fix #296: Explicitly cast size_t results to unsigned when needed 
This is rebased from #297, where AppVeyor had been failing, and which
was not properly based on the master branch.
 2015-07-11 11:00:18 -05:00
Martyn Gigg
717c791d4e Allow an optional suffix on the debug library name in CMake. 2015-06-29 19:20:08 +01:00
Christopher Dunn
17181acf74 Merge remote-tracking branch 'up/master' into 0.y.z 
fix ,/. problem in #294
 2015-06-19 00:11:52 -05:00
Christopher Dunn
6416350438 fix ,/. problem in reader 
fixes #293
 2015-06-18 22:45:36 -05:00
Christopher Dunn
07623b71f2 Merge branch 'master' into 0.y.z 2015-06-18 22:34:40 -05:00
Christopher Dunn
2760c7902a fix #290 2015-06-10 21:22:24 -05:00
Péricles Lopes Machado
97e093a361 fix compile error on android 2015-05-18 14:31:05 -03:00
Christopher Dunn
f40dd0f3ed Merge branch 'master' into 0.y.z 
BORLANDC compilation issues
 2015-04-28 05:09:58 +01:00
Christopher Dunn
6649009ffa another fix for BORLANDC 2015-04-28 04:57:49 +01:00
Christopher Dunn
c334ac0376 Merge branch 'master' into 0.y.z 
- fix for "C++ Builder" IDE
- Travis CI/AppVeyor
- **cmake** tweak
- fix memory leak in unit-test

See #268 and #252.
 2015-04-27 18:33:07 -07:00
Christopher Dunn
a0a7c5f6de a little test for issue 252, but does not fail for me 2015-04-27 18:14:09 -07:00
Gaurav
43019088f0 Use standard CMake variables - static/shared lib. 
Replaced JSONCPP_LIB_BUILD_SHARED => BUILD_SHARED_LIBS
Moved flag JSON_DLL to line no 8.
 2015-04-23 07:32:18 -07:00
Gaurav
0c1c076b7c Use standard CMake variables - static/shared lib. 
Replaced JSONCPP_LIB_BUILD_SHARED => BUILD_SHARED_LIBS
Moved definition DJSON_DLL to line 11.
 2015-04-23 07:32:18 -07:00
Gaurav
11130997c3 Use standard CMake variables - static/shared lib. 
Replace JSONCPP_LIB_BUILD_SHARED => BUILD_SHARED_LIBS
Replace JSONCPP_LIB_BUILD_STATIC => BUILD_STATIC_LIBS
Removed workaround  https://github.com/open-source-parsers/jsoncpp/issues/51
Removed OPTION for shared/static in this file.
 2015-04-23 07:32:17 -07:00
Christopher Dunn
74143f39e7 fix leak in unit-tests 2015-04-22 19:33:41 -07:00
Sam Clegg
db7ad75794 Don't use unique_ptr on pre-c++11 branch 
Don't use C++11 unique_ptr in the 0.y.z branch.
Although this usage is guarded with __cplusplus >= 201103
some build configurations (notably chromium) use a
C++11-compliant compiler but a pre-11 library.

pull #238
 2015-04-12 00:39:25 -05:00
Christopher Dunn
f4bdc1b602 partially revert 'Added features that allow the reader to accept common non-standard JSON.' 
revert '642befc836ac5093b528e7d8b4fd66b66735a98c',
but keep the *added* methods for `decodedNumber()` and `decodedDouble()`.
 2015-04-11 14:49:59 -05:00
Christopher Dunn
93f45d065c partially revert 'fix bug for static init' 
re: 28836b8acc2c002b0488c13dba28fd5be864970a

A global instance of a Value (viz. 'null') was a mistake,
but dropping it breaks binary-compatibility. So we will keep it
everywhere except the one platform where it was crashing, ARM.
 2015-04-11 14:49:59 -05:00
Christopher Dunn
6f6ddaa91c revert 'Made it possible to drop null placeholders from array output.' 
revert ae3c7a7aabfb345968a65001ea9bc25f1e2bb405
 2015-04-11 14:49:59 -05:00
Christopher Dunn
254fe6a07a Revert "added option to FastWriter which omits the trailing new line character" 
This reverts commit 5bf16105b5a90f9fa7d5d4d43452feee46603a52.
 2015-04-11 14:49:59 -05:00
Christopher Dunn
00d7bea0f6 revert 'Added structured error reporting to Reader.' 
revert 68db6553471bb9cb050b1bb888b5933ee758b82d
issue #147
 2015-04-11 14:49:59 -05:00
Christopher Dunn
a9d06d2650 revert 'Add public semantic error reporting' 
for binary-compatibility with 0.6.0
issue #147
was #57
 2015-04-11 14:49:59 -05:00
Christopher Dunn
1c4f6a2d79 partially revert "Switch to copy-and-swap idiom for operator=." 
This partially reverts commit 45cd9490cd261da31cef84a44d2c587be7e26e99.

Ignored ValueInternal* changes, since those did not produce symbols for
Debian build. (They must not have used the INTERNAL stuff.)

Ignored CZString changes since those are private (and sizeof struct did
not change).

  https://github.com/open-source-parsers/jsoncpp/issues/78

Conflicts:
	include/json/value.h
	src/lib_json/json_internalarray.inl
	src/lib_json/json_internalmap.inl
	src/lib_json/json_value.cpp
 2015-04-11 14:49:59 -05:00
Christopher Dunn
50069d72da prefer std::string for setComment() 
in case of embedded nulls
 2015-04-11 14:49:28 -05:00
Christopher Dunn
e255ce31a4 support UTF-8 in old Writers 
We had already fixed Value to hold UTF-8 properly, but only the newer
StreamWriter was writing UTF-8 properly.

Old FasterWriter etc. were using asCString() instead of asString() in
Value::writeValue().

Hopefully this change does not break any existing code. Seems unlikely.

issue #240
 2015-04-11 14:41:30 -05:00