Commit Graph

546 Commits

Author SHA1 Message Date
zhengshuxin
17af199b70 Merge branch 'master' of https://github.com/zhengshuxin/acl 2016-10-20 09:09:34 +08:00
zhengshuxin
4b7499d955 mv websocket into websocket path 2016-10-20 09:08:27 +08:00
郑树新
52401d21fe Merge pull request #48 from acl-dev/master
Merge pull request #16 from zhengshuxin/master
2016-10-19 15:30:49 +08:00
zhengshuxin
7022d29557 fixed one bug in fiber_io.c for init __thread_fiber->loop_fn. 2016-10-19 15:06:09 +08:00
郑树新
da2e4bad1b Merge pull request #16 from zhengshuxin/master
Merge from acl
2016-10-17 23:02:35 +08:00
郑树新
3d10946d67 Merge pull request #47 from acl-dev/master
merge to acl
2016-10-17 23:01:54 +08:00
akzi
da4feafa1e add vector map field 2016-10-17 16:44:12 +02:00
akzi
ff6f3d162b Merge branch 'master' of https://github.com/acl-dev/acl 2016-10-17 22:33:57 +08:00
akzi
9dec28ece4 add pointor = null,if no value exist 2016-10-17 22:32:23 +08:00
郑树新
acff5e9771 Merge pull request #46 from acl-dev/master
merge to acl
2016-10-17 22:25:47 +08:00
zhengshuxin
b52ba569ec add one gson sample: test4 2016-10-17 22:23:21 +08:00
akzi
576a1f6e44 add codes for add_item processing std::string acl::string char * 2016-10-17 16:02:31 +02:00
郑树新
463491d21a Merge pull request #45 from acl-dev/master
merge to acl
2016-10-17 17:06:46 +08:00
zhengshuxin
ec57cdb0b0 add one gson sample: test3 2016-10-17 16:59:27 +08:00
zhengshuxin
497123af7d add one test sample. 2016-10-16 20:22:26 +08:00
郑树新
5d2d733196 Merge pull request #15 from zhengshuxin/master
Merge from acl
2016-10-15 00:10:03 +08:00
zhengshuxin
4e25961a56 add gson into vc2003, 2008, 2010, 2012 2016-10-15 00:07:33 +08:00
郑树新
c6bbd0d002 Merge pull request #44 from acl-dev/master
merge to acl
2016-10-14 22:50:28 +08:00
zhengshuxin
568a5402e6 let gson look like a good C+= style. 2016-10-14 22:48:32 +08:00
郑树新
bd23b7e9b9 Merge pull request #14 from zhengshuxin/master
Merge pull request #43 from acl-dev/master
2016-10-14 17:23:52 +08:00
郑树新
97781a8233 Merge pull request #43 from acl-dev/master
merge from acl
2016-10-14 17:22:46 +08:00
zhengshuxin
eb17148b30 Merge branch 'master' of https://github.com/acl-dev/acl 2016-10-14 17:21:23 +08:00
zhengshuxin
a8b08d7e16 the gson.cpp/gson.h files should be appened "\n" in the end of which. 2016-10-14 17:20:20 +08:00
郑树新
c812ec59fb Merge pull request #13 from zhengshuxin/master
merge from acl
2016-10-14 15:44:31 +08:00
郑树新
36bce80cea Merge pull request #42 from acl-dev/master
merge from acl
2016-10-14 15:43:23 +08:00
dep
b0090e4ce1 C++ serialization module gson can support non C++11. 2016-10-14 15:11:13 +08:00
fuwangqin
b220d1016f Merge branch 'master' of https://github.com/acl-dev/acl 2016-10-14 11:46:47 +08:00
fuwangqin
e6da6177c5 remove c++11 codes 2016-10-14 11:46:09 +08:00
zhengshuxin
d4be6d4abb fixed one compiling warning. 2016-10-13 23:27:09 +08:00
akzi
f1dff79f70 add codes for get_function_declare 2016-10-13 18:11:45 +08:00
akzi
bc55f94abd add codes for get_function_declare 2016-10-13 18:01:16 +08:00
akzi
37e8b3d9e0 fix double include files error 2016-10-13 17:51:38 +08:00
akzi
ebc985d49c Merge branch 'master' of https://github.com/acl-dev/acl 2016-10-13 17:40:37 +08:00
akzi
dfd64f144f fix gson error 2016-10-13 17:38:45 +08:00
郑树新
a7219c6f3f Merge pull request #40 from acl-dev/master
gson support struct members' initialization, fixed one bug in json_no…
2016-10-13 16:18:06 +08:00
zhengshuxin
fee1610ac4 gson support struct members' initialization, fixed one bug in json_node::get_text. 2016-10-13 16:15:38 +08:00
郑树新
80213fb28e Merge pull request #39 from acl-dev/master
merge from acl
2016-10-13 15:57:53 +08:00
zhengshuxin
7de56bb938 rm test1 sample. 2016-10-13 15:55:15 +08:00
zhengshuxin
173b7e5cac add test samples for gson. 2016-10-13 15:35:09 +08:00
akzi
140e74364f add gson 2016-10-13 15:13:26 +08:00
akzi
2fe39cdca3 struct menber initialize 2016-10-13 14:31:46 +08:00
郑树新
6ae0600e10 Merge pull request #12 from zhengshuxin/master
Merge from acl
2016-10-12 22:04:06 +08:00
郑树新
0c621bf15f Merge pull request #38 from acl-dev/master
Merge pull request #11 from zhengshuxin/master
2016-10-12 22:02:58 +08:00
zhengshuxin
e1d747f6c1 move gson module into serialize directory. 2016-10-12 22:00:14 +08:00
郑树新
3bce3a3739 Merge pull request #11 from zhengshuxin/master
Merge from acl
2016-10-11 22:09:01 +08:00
郑树新
3490a3f0de Merge pull request #37 from acl-dev/master
Merge pull request #10 from zhengshuxin/master
2016-10-11 22:07:40 +08:00
zhengshuxin
7095f8a640 fixed bugs in gson_helper.ipp. 2016-10-11 22:04:45 +08:00
郑树新
7d583ad4a1 Merge pull request #10 from zhengshuxin/master
Merge from acl
2016-10-11 21:05:14 +08:00
郑树新
a1510793bc Merge pull request #36 from acl-dev/master
Merge from acl
2016-10-11 21:03:20 +08:00
zhengshuxin
f0e5a302b3 fixed one bug in acl_json_build/acl_json_buiding bug when building a json object. 2016-10-11 20:58:37 +08:00