mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-10-16 18:56:54 +02:00
904dd65965
# Conflicts: # erb/cpp03_define.hpp.erb # erb/cpp03_msgpack_tuple.hpp.erb # erb/cpp03_msgpack_tuple_fwd.hpp.erb # include/msgpack/adaptor/bool_fwd.hpp # include/msgpack/adaptor/char_ptr_fwd.hpp # include/msgpack/adaptor/cpp11/array.hpp # include/msgpack/adaptor/cpp11/array_char.hpp # include/msgpack/adaptor/cpp11/array_char_fwd.hpp # include/msgpack/adaptor/cpp11/array_fwd.hpp # include/msgpack/adaptor/cpp11/forward_list.hpp # include/msgpack/adaptor/cpp11/forward_list_fwd.hpp # include/msgpack/adaptor/cpp11/tuple_fwd.hpp # include/msgpack/adaptor/cpp11/unordered_map.hpp # include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp # include/msgpack/adaptor/cpp11/unordered_set.hpp # include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp # include/msgpack/adaptor/deque_fwd.hpp # include/msgpack/adaptor/detail/cpp03_define.hpp # include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp # include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp # include/msgpack/adaptor/detail/cpp11_define.hpp # include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp # include/msgpack/adaptor/fixint_fwd.hpp # include/msgpack/adaptor/float_fwd.hpp # include/msgpack/adaptor/int_fwd.hpp # include/msgpack/adaptor/list_fwd.hpp # include/msgpack/adaptor/map_fwd.hpp # include/msgpack/adaptor/nil.hpp # include/msgpack/adaptor/nil_fwd.hpp # include/msgpack/adaptor/pair_fwd.hpp # include/msgpack/adaptor/raw.hpp # include/msgpack/adaptor/raw_fwd.hpp # include/msgpack/adaptor/set_fwd.hpp # include/msgpack/adaptor/string_fwd.hpp # include/msgpack/adaptor/tr1/unordered_map.hpp # include/msgpack/adaptor/tr1/unordered_map_fwd.hpp # include/msgpack/adaptor/tr1/unordered_set.hpp # include/msgpack/adaptor/tr1/unordered_set_fwd.hpp # include/msgpack/adaptor/vector.hpp # include/msgpack/adaptor/vector_bool_fwd.hpp # include/msgpack/adaptor/vector_char.hpp # include/msgpack/adaptor/vector_char_fwd.hpp # include/msgpack/adaptor/vector_fwd.hpp