Takatoshi Kondo
96c688708c
Merge pull request #158 from redboltz/update_examples
...
Moved examples.
2014-11-01 18:28:15 +09:00
Takatoshi Kondo
79e7a9810c
Moved examples.
...
Added intrusive and non-intrusive versions of packing and unpacking examples.
2014-11-01 18:13:52 +09:00
Takatoshi Kondo
a0ae0289dc
Merge pull request #157 from redboltz/fix_vc2008_warnings
...
Added warnings suppress option.
2014-11-01 17:04:51 +09:00
Takatoshi Kondo
31a3d34b49
Added warnings suppress option.
...
Changed buffer type from char to unsigned char.
2014-11-01 16:36:40 +09:00
Takatoshi Kondo
1c54d804f5
Merge pull request #156 from redboltz/fix_example_issue_155
...
Fixed return type.
2014-11-01 13:40:14 +09:00
Takatoshi Kondo
111efdf50f
Fixed return type.
2014-11-01 13:18:17 +09:00
Takatoshi Kondo
dac8f6290d
Merge pull request #154 from redboltz/fix_issue_153
...
Fixed https://github.com/msgpack/msgpack-c/issues/153
2014-10-31 16:23:23 +09:00
Takatoshi Kondo
3bfd142660
Fixed https://github.com/msgpack/msgpack-c/issues/153
2014-10-31 15:50:57 +09:00
Takatoshi Kondo
d031162d96
Merge pull request #146 from redboltz/fixed_char_pack
...
Fixed char packing support.
2014-10-31 12:51:53 +09:00
Takatoshi Kondo
8e24d9206a
Merge pull request #152 from redboltz/fix_inttypes_on_vc2010
...
https://github.com/msgpack/msgpack-c/issues/147
Fixed MSVC2010 doesn't have inttypes.h problem.
2014-10-31 11:31:17 +09:00
Takatoshi Kondo
b78b49a7bd
Fixed MSVC2010 doesn't have inttypes.h problem.
2014-10-31 10:50:19 +09:00
Takatoshi Kondo
561e9ba105
Merge pull request #150 from redboltz/fix_fprintf_macro
...
Fixed https://github.com/msgpack/msgpack-c/issues/148
2014-10-31 10:17:24 +09:00
Takatoshi Kondo
6e84266043
Merge pull request #151 from redboltz/fix_build_vc2010
...
Fixed https://github.com/msgpack/msgpack-c/issues/147
2014-10-31 10:17:13 +09:00
Takatoshi Kondo
151c92d08d
Fixed https://github.com/msgpack/msgpack-c/issues/147
...
On VC9 (Visual Studio 2008) and VC10 (Visual Studio 2010), .c files are compiled as C++. Otherwise the files are compiled as C.
2014-10-31 00:04:44 +09:00
Takatoshi Kondo
1285470c21
Fixed https://github.com/msgpack/msgpack-c/issues/148
...
Fixed inttypes.h inclusion problem on MSVC.
Fixed msgpack_object_print implementation using PRIi8, PRIi64, and PRIu64.
If 64bit print is not supported on fprintf, dispatch to fallback print.
2014-10-30 23:54:33 +09:00
Takatoshi Kondo
837c5ecfc3
Fixed char packing support.
...
See https://github.com/msgpack/msgpack-c/issues/57#issuecomment-60670037
2014-10-28 10:48:49 +09:00
Takatoshi Kondo
04aa309f24
Merge pull request #145 from redboltz/add_help_comments_for_compile_error
...
Added help comments for compile error.
2014-10-27 20:12:44 +09:00
Takatoshi Kondo
69b2ea4002
Added help comments for compile error.
2014-10-27 17:41:06 +09:00
Takatoshi Kondo
8ddc219365
Merge pull request #143 from redboltz/solve_conflicts_on_readme
...
Solved conflicts on README.md.
2014-10-27 13:00:40 +09:00
Takatoshi Kondo
a9cf916b82
Solved conflicts on README.md.
2014-10-27 11:09:49 +09:00
Takatoshi Kondo
8455a2eb70
Merge branch 'redboltz-poc/0.6'
2014-10-26 15:40:41 +09:00
Takatoshi Kondo
5c0f1db25c
Merge branch 'poc/0.6' of https://github.com/redboltz/msgpack-c into redboltz-poc/0.6
...
Conflicts:
.travis.yml
CMakeLists.txt
README.md
ci/build_autotools.sh
ci/build_cmake.sh
src/msgpack/object.hpp
src/msgpack/type/fixint.hpp
src/msgpack/type/int.hpp
src/msgpack/type/tr1/unordered_map.hpp
src/msgpack/type/tr1/unordered_set.hpp
test/msgpack_test.cpp
test/object.cc
2014-10-26 15:40:22 +09:00
Takatoshi Kondo
466986b519
Merge branch 'redboltz-api_versioning' into poc/0.6
2014-10-26 13:28:03 +09:00
Takatoshi Kondo
a6aac482dd
Merge branch 'api_versioning' of https://github.com/redboltz/msgpack-c into redboltz-api_versioning
...
Conflicts:
include/msgpack/unpack.hpp
2014-10-26 09:43:36 +09:00
Takatoshi Kondo
bb984d3445
Merge pull request #141 from redboltz/add_32bit_test_for_travisci
...
Added a 32bit environment tests for travis-ci.
2014-10-26 09:33:05 +09:00
Takatoshi Kondo
f8e2766d28
Added a 32bit environment tests for travis-ci.
2014-10-26 09:06:01 +09:00
Takatoshi Kondo
2d5d12f9a6
Merge pull request #140 from redboltz/fix_issue95_on_poc0.6
...
Fixed https://github.com/msgpack/msgpack-c/pull/95 on poc/0.6 branch.
2014-10-24 22:37:37 +09:00
Takatoshi Kondo
11a2a1b8ec
Fixed https://github.com/msgpack/msgpack-c/pull/95 on poc/0.6 branch.
2014-10-21 22:13:53 +09:00
Takatoshi Kondo
b5e66150e9
Minimized header files dependency.
...
Added help comments for typical compile error.
2014-10-19 21:18:30 +09:00
Takatoshi Kondo
e21e3245db
Merge pull request #138 from redboltz/move_byteswap
...
Moved include byteswap.h to sysdep.h.
2014-10-19 19:42:38 +09:00
Takatoshi Kondo
07e7ad6b7e
Merge pull request #137 from redboltz/remove_tr1_from_test
...
Removed wrong tr1:: from unordered containers.
2014-10-19 19:37:10 +09:00
Takatoshi Kondo
44b524529d
Merge pull request #136 from redboltz/replace_uint64_t_with_apropriate_types
...
Replaced uint64_t with apropriate types.
2014-10-19 19:26:42 +09:00
Takatoshi Kondo
fc65bc0682
Replaced tuple with std::tuple.
...
Added include file int_fwd.hpp for MSGPACK_ADD_ENUM.
2014-10-16 14:07:53 +09:00
Takatoshi Kondo
ca12e6d39d
Added packer_serializer class template declaration to object_fwd.hpp
2014-10-16 14:06:57 +09:00
Takatoshi Kondo
db8578a62b
Separated adaptor functions' definitions and declarations.
2014-10-16 11:21:26 +09:00
Takatoshi Kondo
4a292193f2
Moved include byteswap.h to sysdep.h.
...
When compiling on Mac, byteswap.h is not included.
2014-10-12 01:22:10 +09:00
Takatoshi Kondo
1e7fbc0349
Removed wrong tr1:: from unordered containers.
2014-10-12 00:20:54 +09:00
Takatoshi Kondo
479d50bd93
Replaced uint64_t with apropriate types.
2014-10-11 23:45:21 +09:00
Nobuyuki Kubota
982787865f
Merge pull request #127 from redboltz/clear_set_map
...
Fixed https://github.com/msgpack/msgpack-c/issues/76
2014-10-06 15:12:20 -07:00
Nobuyuki Kubota
bf4a57da34
Merge branch 'object-with-zone-copy'
2014-10-06 14:07:06 -07:00
Nobuyuki Kubota
2fcbe6116d
Replace C-style casts with C++-style ones
2014-10-06 14:06:21 -07:00
Takatoshi Kondo
4c00f448aa
Added a minimal forward declaration header file for pack/unpack overloading.
2014-10-01 14:33:02 +09:00
Takatoshi Kondo
3ddeb08e6e
Added API versioning.
2014-10-12 23:21:25 +09:00
Takatoshi Kondo
0176dd760a
Merge pull request #131 from shafik/master
...
Fixing undefined behavior introduced by the incorrect use of comma
2014-09-20 17:39:44 +09:00
Jakob Petsovits
d30548af3f
Add support for copying an object to an object::with_zone.
...
With test.
2014-09-20 00:13:40 -04:00
Jakob Petsovits
ab12b2b2b9
Specialize operator<<(packer, T) also for object::with_zone.
...
It already existed for T = object, but if trying to pass an
object::with_zone it would match the generic operator<<() instead.
That operator calls o.msgpack_pack(), which doesn't exist and
causes a compile error.
(Re-)Using the overload for object is a better way to handle this.
2014-09-19 22:48:24 -04:00
Takatoshi Kondo
7ce69a362f
Merge pull request #130 from jpetso/master
...
Support std::unordered_map/set even if using libstdc++ from GCC.
2014-09-20 00:06:51 +09:00
Takatoshi Kondo
cc08146b1c
Merge pull request #132 from redboltz/support_travis_ci
...
Added travis-ci support.
2014-09-19 23:57:40 +09:00
Takatoshi Kondo
6896cc602f
Added travis-ci support.
2014-09-19 23:42:07 +09:00
Shafik Yaghmour
d8f366daf2
Fixing undefined behavior introduced by the incorrect use of comma operator with the conditional operator. The middle expression in a conditional operator between the ? and : is implicitly parenthesized but the end expression is not. Since the comma operator as he lowest precendence( http://en.cppreference.com/w/cpp/language/operator_precedence ) this means the conditional operator will be evaluated first and then the expression on the right hand side of the comma operator will be evaluated. This leads to undefined behavior because the last member of the union being updated will not be the member that will be used next which is strictly undefined in C++ although gcc and clang aloow this type punning as an extension but is clearly not portable behavior nor was this the intended behavior. instead of parenthesising the end expression I choose to use an if/else which is not subject to such easy to miss precdence issues. This Coliru live code demonstrates the bug with simple example: http://coliru.stacked-crooked.com/a/1041aaa8380feeaa the code also demonstrates the using the right warning flags gcc will generate a warning for this code.
2014-09-18 14:29:11 -04:00