Commit Graph

191 Commits

Author SHA1 Message Date
zosrothko
960ecb38f0 Poco 1.9.1 assert true (#2255)
* Rename assert by assertTrue

* Update submodules

* Missing assertTrue

* Rename poco_assertTrue to poco_assert

* Rename poco_assertTrue to poco_assert
2018-03-29 11:12:54 -06:00
Günter Obiltschnig
5a1bf5eb4a fixed GH #2249: Poco::JSON::Object::set() should return reference to this to allow chaining 2018-03-27 11:47:05 +02:00
Günter Obiltschnig
009b459622 regen project files 2018-03-07 12:54:30 +01:00
Günter Obiltschnig
7eb1325bba style fixes 2018-03-05 15:05:04 +01:00
Joerg-Christian Boehme
9feabc7723 Add android build on travis (#1981)
* Add build for android in travis CI.

* Fix review findings. Change from __ANDORID__ to POCO_ANDROID

* Add android test

* Fix compile issue after rebase

* Ignore test big ping when its failing
2018-02-26 18:54:40 -06:00
Conor Burgess
2632f34e85 Stricter JSON standard conformance (#2153) 2018-02-13 07:26:20 -06:00
Conor Burgess
bdd0478ead Fix nullptr deref in Poco::JSON::Object (#2150) 2018-02-09 10:18:23 -06:00
Alex Fabijanic
fc47df04cd #2142 #2137 cherry pick 3 2018-02-08 20:01:36 -06:00
Alex Fabijanic
fac2437fab fix toJSON function and some VS warnings 2018-02-08 19:46:02 -06:00
Aleksandar Fabijanic
fbd229ee4a #2142 #2137 cherry pick 2 2018-02-08 19:45:37 -06:00
Aleksandar Fabijanic
bd81aec779 #2142 #2137 cherry pick 1 2018-02-08 19:41:44 -06:00
Alex Fabijanic
03daed2230 ifdef closing coment fix 2018-01-31 20:58:38 -06:00
Alex Fabijanic
66f122b35f clang compile 2018-01-31 19:34:43 -06:00
Alex Fabijanic
e143bdce35 remove includes (already included in header) 2018-01-31 18:52:33 -06:00
Alex Fabijanic
02aa9262fe remove old pdjson header VS projects entries 2018-01-31 18:39:55 -06:00
Alex Fabijanic
e8be21dc66 Poco1.8.1 compilation error for C++98 mode #2121 2018-01-31 18:32:15 -06:00
Günter Obiltschnig
6e89a241e8 revert last change 2018-01-02 12:52:47 +01:00
Günter Obiltschnig
6774b5deb6 merge JSON fix from develop 2018-01-02 12:12:59 +01:00
Guenter Obiltschnig
c672c14e5a remove duplicate files and remaining Id headers 2017-11-10 09:26:24 +01:00
Alex Fabijanic
18c3ed3941 change json_error_s into function 2017-11-09 07:04:27 -06:00
Alex Fabijanic
94ef939f93 remove _CRT_SECURE_NO_WARNINGS from JSON.progen and regenerate JSON VS projects 2017-11-08 17:53:40 -06:00
Alex Fabijanic
21b2dfa944 replace strerror 2017-11-08 17:51:59 -06:00
Francis ANDRE
5591d10a21 Merge remote-tracking branch 'origin/poco-1.8.0' into poco-1.8.0 2017-10-31 18:11:51 +01:00
Alex Fabijanic
ba876aa4cd fix JSON windows compile 2017-10-31 12:06:18 -05:00
Guenter Obiltschnig
d172273a75 remove remaining $Id$ tags from file headers 2017-10-31 16:01:51 +01:00
zosrothko
f2e58c17e8 Add Gradle build scripts. 2017-10-31 09:07:53 +01:00
Alex Fabijanic
71946d9d18 move pd_json headers to src 2017-10-06 09:56:13 -05:00
Alex Fabijanic
7943d95b31 pd_json.h is missing when installed via CMake in 1.8.0 #1923 2017-10-06 09:22:55 -05:00
Alex Fabijanic
fab661a4a3 fix linux build 2017-09-27 13:03:29 -05:00
Alex Fabijanic
1054c46f6c compile pdjson as C++; disarm some windows warnings 2017-09-27 11:51:43 -05:00
Alex Fabijanic
6bcd362c74 use _snprintf_s on VS < 2015 2017-09-27 11:25:43 -05:00
Pascal Bach
f26cebc309 JSON: Fix missing objects with pd_json and CMake (#1908)
Seems it got lost during the backport to 1.8.0
2017-09-27 09:47:12 -05:00
Alex Fabijanic
fabfb4f068 updte json makefile 2017-09-25 16:28:26 -05:00
Alex Fabijanic
6efab2cd58 back-port JSON and accompanying Foundation portions (JSONString, Dynamic::Var etc) 2017-09-25 15:15:05 -05:00
Günter Obiltschnig
04e7e04d4d Remove \$Id`$ headers 2017-09-09 11:14:06 +02:00
Guenter Obiltschnig
f10d3a28f3 added Visual Studio 2017 project files 2017-02-20 16:20:16 +01:00
Guenter Obiltschnig
bd82bb1306 minor improvements to documentation and style 2017-02-13 22:33:48 +01:00
Guenter Obiltschnig
bfdf04ca72 fixed GH #1521: bug in JSON ParseHandler.cpp (empty keys should be valid) 2016-12-29 11:22:16 +01:00
Guenter Obiltschnig
075cfeb4cb fix uninitialized member in ctor 2016-09-26 18:12:56 +02:00
Guenter Obiltschnig
08e4f6af17 doc fixes 2016-08-28 17:17:56 +02:00
Günter Obiltschnig
f9f4c54bc3 fixed GH #1355: [JSON::Object] After copy-ctor, JSON::Object::_keys still points to keys in map of copied object 2016-08-27 10:54:35 +02:00
Guenter Obiltschnig
0ec65720ab removed unused #include 2015-09-30 10:31:50 +02:00
Guenter Obiltschnig
e25a17030d integrated CMake improvements from develop (GH #946) 2015-09-26 11:11:23 +02:00
Aleksandar Fabijanic
4f885a8b66 Change in JSON::Object::set(key,value) behavior in 1.6.1 #933
fix according to [suggestion](fee347ec6a (commitcomment-13196733))
2015-09-12 13:19:28 -05:00
Guenter Obiltschnig
468f2e029b fix for NumberParser changes 2015-09-11 08:17:57 +02:00
Aleksandar Fabijanic
26e76482c5 Change in JSON::Object::set(key,value) behavior in 1.6.1 #933 2015-09-11 07:46:54 +02:00
Guenter Obiltschnig
87f0bac343 fix for VS2008 2015-08-03 07:33:37 +02:00
Günter Obiltschnig
4f0b692d66 added project and solution files for VS2015 2015-08-01 10:29:32 +02:00
Alex Fabijanic
5a5509a3e3 fixed GH #782 and #819 2015-06-09 22:41:38 -05:00
Aleksandar Fabijanic
3553a86d60 JSON Stringifier fails with preserve insert order #819 2015-05-14 22:12:52 -05:00