Commit Graph

3252 Commits

Author SHA1 Message Date
郑树新
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
akzi
37963bba16 add app/gson app/demo project in sln 2016-10-11 18:08:42 +08:00
akzi
dc6139b45b add some code for test gson 2016-10-11 18:07:03 +08:00
akzi
39ebbd5f8d add null for nullptr 2016-10-11 18:03:26 +08:00
akzi
9dfde46b79 fix .gitignore vs gen files 2016-10-11 16:29:08 +08:00
akzi
f13011d790 fix gson vs project 2016-10-10 23:31:14 +08:00
郑树新
9faa536a3d Merge pull request #9 from zhengshuxin/master
Merge from acl
2016-10-10 23:05:57 +08:00
郑树新
f4b589ab88 Merge pull request #35 from acl-dev/master
Merge pull request #8 from zhengshuxin/master
2016-10-10 23:04:54 +08:00
zhengshuxin
8fc6f990f2 add null type for json module when building json obj. 2016-10-10 23:03:05 +08:00
郑树新
ffe2bd6173 Merge pull request #8 from zhengshuxin/master
Merge from acl
2016-10-09 22:08:55 +08:00
郑树新
118d893e92 Merge pull request #34 from acl-dev/master
Merge pull request #7 from zhengshuxin/master
2016-10-09 22:07:59 +08:00
zhengshuxin
0a711b0049 add comment in header file. 2016-10-09 22:05:41 +08:00
郑树新
77fa1029ce Merge pull request #7 from zhengshuxin/master
Merge from acl
2016-10-09 21:53:07 +08:00
郑树新
49e6e70d93 Merge pull request #33 from acl-dev/master
Merge pull request #6 from zhengshuxin/master
2016-10-09 21:51:42 +08:00
zhengshuxin
0ad006d887 add test sample for gson. 2016-10-09 21:49:35 +08:00
郑树新
330c0ece36 Merge pull request #6 from zhengshuxin/master
merge from acl
2016-10-09 17:27:34 +08:00
郑树新
aaa7ffe1d6 Merge pull request #32 from acl-dev/master
merge from acl
2016-10-09 17:26:04 +08:00
zhengshuxin
3c379e8d28 Merge branch 'master' of https://github.com/zhengshuxin/acl 2016-10-09 17:20:02 +08:00
zhengshuxin
e31b1d3bc9 delete unused file. 2016-10-09 17:19:13 +08:00
akzi
6d721fdb81 add check get_initializelist result 2016-10-09 14:31:50 +08:00
akzi
0d47c22e9d add struct construct InitializeList support 2016-10-09 14:28:08 +08:00
郑树新
fbf7dd4717 Merge pull request #5 from zhengshuxin/master
Merge from acl
2016-10-09 00:12:45 +08:00
郑树新
f37b3c9637 Merge pull request #31 from acl-dev/master
Merge pull request #4 from zhengshuxin/master
2016-10-09 00:12:00 +08:00
zhengshuxin
4347135b64 Merge branch 'master' of https://github.com/zhengshuxin/acl 2016-10-09 00:10:53 +08:00
zhengshuxin
88481f7314 modify gson_helper.ipp for build 2016-10-09 00:10:05 +08:00
郑树新
1449ab657b Merge pull request #4 from zhengshuxin/master
Merge from acl
2016-10-08 22:22:37 +08:00
郑树新
b2ea20c0c4 Merge pull request #30 from acl-dev/master
Merge pull request #3 from zhengshuxin/master
2016-10-08 22:19:01 +08:00
zhengshuxin
3c911f4319 delete unused files. 2016-10-08 22:17:54 +08:00
郑树新
1c7ff87e9f Merge pull request #3 from zhengshuxin/master
Merge from acl
2016-10-08 22:15:50 +08:00
zhengshuxin
fcf36bf477 add json serializing module -- gson. 2016-10-08 22:11:25 +08:00
郑树新
233998cb6f Merge pull request #29 from acl-dev/master
Merge from acl
2016-10-08 19:56:48 +08:00
zhengshuxin
0205b82f71 delete useless file. 2016-10-08 19:52:38 +08:00
akzi
b80c04daf4 delete useless files 2016-10-07 23:08:53 +08:00
akzi
4063cd7318 add gson vs2015 project 2016-10-07 23:07:33 +08:00
郑树新
88af83152c Merge pull request #2 from zhengshuxin/master
Merge from acl
2016-10-07 21:46:38 +08:00
郑树新
cd8d75a62a Merge pull request #28 from acl-dev/master
Merge from acl
2016-10-07 21:43:10 +08:00
zhengshuxin
4531d17ad6 add lost files. 2016-10-07 21:40:27 +08:00
zhengshuxin
2b4091c0ac dummy! 2016-10-07 20:42:02 +08:00
zhengshuxin
535494a264 fixed one bug in json class; add fiber_chat for chatting application. 2016-10-07 20:01:57 +08:00
zhengshuxin
82c05c80b1 add gson for struct serializing to json. 2016-10-07 19:11:41 +08:00
fuwq
eff9fadfd7 Merge pull request #1 from zhengshuxin/master
pull request
2016-09-30 22:30:01 +08:00
zhengshuxin
7c412e4745 add lost configure.h 2016-09-28 20:56:17 +08:00
zhengshuxin
e519887c5e add user.html 2016-09-28 17:33:33 +08:00
zhengshuxin
c2655e08c6 compiling websocket class in DLL mode. 2016-09-28 17:08:32 +08:00
zhengshuxin
de4ad851bf add ACL_CPP_API before websocket class for building DLL by VC. 2016-09-28 16:19:39 +08:00
zhengshuxin
4f15d51138 add fiber chat sample. 2016-09-28 16:05:55 +08:00