Commit Graph

2104 Commits

Author SHA1 Message Date
Takatoshi Kondo
a97c00e463 Added msgpack::object cheking code before covert it. 2016-11-02 08:53:14 +09:00
Takatoshi Kondo
e61cd76310 Supported any names for MSGPACK_DEFINE_MAP using MSGPACK_NVP. 2016-10-30 16:25:19 +09:00
Takatoshi Kondo
c30962da25 Merge branch 'mika-fischer-fix_cmake_cxx_headers' 2016-10-30 14:10:08 +09:00
Takatoshi Kondo
6b7becdef0 Fix typo that caused the C++ headers not to be included in cmake file generating script. 2016-10-30 14:08:56 +09:00
Takatoshi Kondo
cfa1ab38cc Merge branch 'fix_cmake_cxx_headers' of https://github.com/mika-fischer/msgpack-c into mika-fischer-fix_cmake_cxx_headers 2016-10-30 14:05:57 +09:00
Takatoshi Kondo
2f34d22bf5 Merge pull request #533 from Kronuz/patch-1
Save the flags of the stream
2016-10-29 13:28:10 +09:00
Takatoshi Kondo
401460b7d9 Merge pull request #531 from redboltz/fix_521
Fixed #521.
2016-10-29 12:56:49 +09:00
Germán M. Bravo
03b770fdf2 Save the flags of the stream
Changing the stream to `std::hex` mode should only affect the current character; otherwise printing some msgpack with a list like this: `[123, "string\\u0003", 123]` (123 decimal) ends up printing `[123, "string\\u0003", 7b]`, as `std::hex` is sticky.
2016-10-28 15:27:03 -05:00
Mika Fischer
d3cd07987b Fix typo that caused the C++ headers not to be included in CMake project 2016-10-17 17:05:07 +02:00
Takatoshi Kondo
ccc9ac5538 Fixed #521.
Introduced new object type `FLOAT32` and `FLOAT64`.
`FLOAT64` is equivalent to `FLOAT`.
The both internal expressions are f64(double).
2016-10-11 23:23:06 +09:00
Takatoshi Kondo
1df97bc37b Merge pull request #530 from mbodmer/master
Removed MSGPACK_ENABLE_GCC_CXX_ATOMIC macro
2016-10-11 20:52:51 +09:00
Marc Bodmer
8d09b7090d Removed MSGPACK_ENABLE_GCC_CXX_ATOMIC macro since this does not exist in user code and this code would not be active then. 2016-10-11 10:33:08 +02:00
Takatoshi Kondo
2a7335ae90 Merge pull request #529 from mbodmer/master
Fixing building with gcc_atomic.hpp
2016-10-10 19:59:27 +09:00
Marc Bodmer
e7eae65ab7 Fixed path of gcc_atomic.h and gcc_atomic.hpp in definition of _msgpack_atomic_counter_header 2016-10-10 10:42:08 +02:00
Marc Bodmer
4e663609ca Fixed name of define as evaluated in CMakeLists.txt 2016-10-10 10:40:45 +02:00
Takatoshi Kondo
98820ec6c7 Merge pull request #528 from redboltz/fix_519
Fixed #519.
2016-10-09 13:34:07 +09:00
Takatoshi Kondo
baea172cc9 Fixed #519.
Suppressed maybe unused warnings.
2016-10-09 12:06:35 +09:00
Takatoshi Kondo
e9e31a2899 Merge pull request #526 from redboltz/fix_525
Fixed #525.
2016-10-09 11:42:14 +09:00
Takatoshi Kondo
8ffb619031 Fixed #525.
Set osx version.
2016-10-09 10:17:50 +09:00
Takatoshi Kondo
a3ed6274c2 Merge pull request #524 from starthal/readme-remove-autotools
Remove autotools instructions from README
2016-10-08 20:29:50 +09:00
Stephen Albert
f795e5d568 Remove autotools instructions from README 2016-10-05 14:41:01 -04:00
Takatoshi Kondo
87ff7e4ccc Merge pull request #515 from edsiper/unpacker_size
unpack: new msgpack_unpacker_next_with_size() function
2016-09-11 19:32:48 +09:00
Eduardo Silva
da46fb1ef7 test: c: add test for new msgpack_unpacker_next_with_size()
Signed-off-by: Eduardo Silva <eduardo@treasure-data.com>
2016-09-07 16:24:52 -06:00
Eduardo Silva
b90bcf3c11 unpack: unpacker_next_with_size() update parsed bytes on success or continue
This patch makes unpacker_next_with_size(...), update p_bytes when
unpacker_next() returns MSGPACK_UNPACK_SUCCESS or MSGPACK_UNPACK_CONTINUE.

Signed-off-by: Eduardo Silva <eduardo@treasure-data.com>
2016-09-06 10:46:30 -06:00
Takatoshi Kondo
c1f19c0e47 Merge pull request #504 from redboltz/fix_503
Fixed #503.
2016-09-06 23:00:17 +09:00
Eduardo Silva
d9a77e220a unpack: new msgpack_unpacker_next_with_size() function
This new function is an extension of the original msgpack_unpacker_next()
where it now adds third argument to store the number of parsed bytes for
the returned buffer upon a MSGPACK_UNPACK_SUCCESS case.

This is useful for cases where the caller needs to optimize memory usage
in the original buffer,s so upon success retrieval of the object, it can
later deprecate the already 'parsed' bytes.

For more details about the origins of this function please refer to the
following issue on github:

  https://github.com/msgpack/msgpack-c/issues/514

Signed-off-by: Eduardo Silva <eduardo@treasure-data.com>
2016-08-31 16:49:14 -06:00
Takatoshi Kondo
894547582b Merge branch 'pkrenz-VariadicC11Fix' 2016-08-30 08:47:21 +09:00
Takatoshi Kondo
3a87cc8826 Merge branch 'VariadicC11Fix' of https://github.com/pkrenz/msgpack-c-1 into pkrenz-VariadicC11Fix 2016-08-30 00:04:09 +09:00
Takatoshi Kondo
6177038fcf Merge branch 'mdrohmann-master' 2016-08-29 23:59:08 +09:00
Takatoshi Kondo
25259dc705 Updated gtest location. 2016-08-29 22:49:12 +09:00
Takatoshi Kondo
5d69c22bf9 Use OR instead of AND for all classes that have multiple types.
Revert example. Combination of has_as and not has_as are move to tests.
2016-08-29 22:12:01 +09:00
Philipp
a9caff538e Fix warning in versioning 2016-08-26 16:56:01 +02:00
Martin C Drohmann
9a2bb0c972 demonstrate the motivation behind the previous patch 2016-08-23 15:09:02 -07:00
Martin C Drohmann
7191a3b014 enable as<map<...> > implementation when the key OR the value have as() 2016-08-23 15:03:14 -07:00
Takatoshi Kondo
b82b58f184 Merge pull request #508 from redboltz/fix_507
Fixed #507.
2016-08-02 22:26:45 +09:00
Takatoshi Kondo
73af452ed8 Fixed #507.
Removed -Wno-mismatched-tags option from g++.
g++ doesn't support the option and doesn't care the mismatch originally.
2016-07-29 19:49:53 +09:00
Takatoshi Kondo
95b31d0d16 Merge pull request #505 from smititelu/buffer-print-bin
Print unprintable characters in memory buffer
2016-07-21 21:10:41 +09:00
Stefan Mititelu
c73d9a9dab Print unprintable characters in memory buffer 2016-07-19 12:17:38 +00:00
Takatoshi Kondo
0164c1efe2 Merge branch 'iphydf-bin-printer' 2016-07-16 10:26:16 +09:00
Takatoshi Kondo
48abfe7aa1 Adusted coding style. 2016-07-16 10:25:38 +09:00
Takatoshi Kondo
8105c33f9d Merge branch 'bin-printer' of https://github.com/iphydf/msgpack-c into iphydf-bin-printer 2016-07-16 10:19:40 +09:00
Takatoshi Kondo
237cf888d8 Merge branch 'smititelu-master' 2016-07-16 09:33:58 +09:00
Takatoshi Kondo
b9bc9d4195 Replaced uint32_t with size_t.
User buffer size is not limited by msgpack-c so size_t is the
appropriate type.
2016-07-16 09:32:19 +09:00
Takatoshi Kondo
aa790ba785 Merge branch 'master' of https://github.com/smititelu/msgpack-c into smititelu-master 2016-07-16 09:20:39 +09:00
iphydf
1da0539a00 Improve bin/ext printer for unprintable characters.
msgpack_object_print used fwrite to write binary data to a stream. The intention
of the function is to produce a human-readable representation of the object for
debugging purposes. Having arbitrary data dumped as is can cause issues with
terminals that interpret it as control sequences.

This change prints printable characters as is and unprintable characters as
hex-escapes ("\xNN"). Note that UTF-8 encoded characters will now be printed as
escaped sequence of UTF-8 bytes. This is an acceptable compromise, as doing
otherwise would require a light form of UTF-8 decoding and BIN-typed objects
should not be used to transport UTF-8 strings anyway (STR should be used
instead).
2016-07-12 13:31:05 +02:00
Takatoshi Kondo
d7a656523b Fixed #503.
Fixed fwrite return value comparison.
2016-07-11 19:34:10 +09:00
Takatoshi Kondo
f573fd6a26 Merge pull request #499 from redboltz/fix_498
Fixed #498.
2016-07-10 09:27:11 +09:00
Stefan Mititelu
4fa661a63d Add msgpack_object_print_buffer() function
In order to print the msgpack object in a memory buffer.
2016-07-07 22:43:48 +03:00
Takatoshi Kondo
2e4de8b65c Fixed #498.
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=38764
2016-07-06 21:52:08 +09:00
Takatoshi Kondo
42181289ed Merge pull request #492 from redboltz/ver2.0.0
Appended CHANGELOG. Updated version.
cpp-2.0.0
2016-06-25 13:42:05 +09:00