generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-04-24 17:18:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'redboltz-fix_doxygen_support'

Browse Source
This commit is contained in:
Takatoshi Kondo 2015-04-03 15:00:09 +09:00
commit 232b8039a0
47 changed files with 261 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -218,6 +218,8 @@ IF (DOXYGEN_FOUND)
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
COMMAND ${CMAKE_COMMAND} -E echo "FILE_PATTERNS = *.h" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
COMMAND ${CMAKE_COMMAND} -E echo "OUTPUT_DIRECTORY = doc_c" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
COMMAND ${CMAKE_COMMAND} -E echo "INPUT = ${CMAKE_CURRENT_SOURCE_DIR}/include" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
COMMAND ${CMAKE_COMMAND} -E echo "EXTRACT_ALL = YES" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
COMMAND ${CMAKE_COMMAND} -E echo "PROJECT_NAME = \"MessagePack for C\"" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_c
VERBATIM
@ -227,6 +229,8 @@ IF (DOXYGEN_FOUND)
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
COMMAND ${CMAKE_COMMAND} -E echo "FILE_PATTERNS = *.hpp" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
COMMAND ${CMAKE_COMMAND} -E echo "OUTPUT_DIRECTORY = doc_cpp" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
COMMAND ${CMAKE_COMMAND} -E echo "INPUT = ${CMAKE_CURRENT_SOURCE_DIR}/include" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
COMMAND ${CMAKE_COMMAND} -E echo "EXTRACT_ALL = YES" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
COMMAND ${CMAKE_COMMAND} -E echo "PROJECT_NAME = \"MessagePack for C++\"" >> ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_cpp
VERBATIM

18
erb/cpp03_define.hpp.erb
View File

@ -42,7 +42,9 @@
// MSGPACK_ADD_ENUM must be used in the global namespace.
#define MSGPACK_ADD_ENUM(enum_name) \
namespace msgpack { \
/** @cond */ \
MSGPACK_API_VERSION_NAMESPACE(v1) { \
/** @endcond */ \
namespace adaptor { \
template<> \
struct convert<enum_name> { \
@ -73,18 +75,22 @@
} \
}; \
} \
/** @cond */ \
} \
/** @endcond */ \
}
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
/// @cond
<% GENERATION_LIMIT = 31 %>
template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
struct define;
/// @endcond
template <>
struct define<> {
@ -106,6 +112,8 @@ struct define<> {
o->via.array.size = 0;
}
};
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
struct define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
@ -144,11 +152,14 @@ struct define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
A<%=j%>& a<%=j%>;<%}%>
};
<%}%>
/// @endcond
inline define<> make_define()
{
return define<>();
}
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define(A0& a0<%1.upto(i) {|j|%>, A<%=j%>& a<%=j%><%}%>)
@ -156,9 +167,12 @@ define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_define(A0& a0<%1.upto(i) {|j|%>,
return define<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
}
<%}%>
/// @endcond
} // namespace type
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

20
erb/cpp03_msgpack_tuple.hpp.erb
View File

@ -24,7 +24,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
@ -32,8 +34,10 @@ namespace type {
// FIXME operator!=
<% GENERATION_LIMIT = 31 %>
/// @cond
template <typename A0 = void<%1.upto(GENERATION_LIMIT+1) {|i|%>, typename A<%=i%> = void<%}%>>
struct tuple;
/// @endcond
template <typename Tuple, int N>
struct tuple_element;
@ -68,6 +72,7 @@ struct tuple_type<const T&> {
typedef const T& transparent_reference;
};
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
<%0.upto(i) {|j|%>
template <typename A0<%1.upto(i) {|k|%>, typename A<%=k%><%}%>>
@ -92,6 +97,7 @@ private:
};
<%}%>
<%}%>
/// @endcond
template <>
struct tuple<> {
@ -99,6 +105,8 @@ struct tuple<> {
tuple(msgpack::object const& o) { o.convert(*this); }
typedef tuple<> value_type;
};
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
struct tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
@ -122,11 +130,14 @@ template <int N, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
inline typename type::const_tuple_element<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>, N>::const_reference get(type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> const& t)
{ return t.template get<N>(); }
<%}%>
/// @endcond
inline tuple<> make_tuple()
{
return tuple<>();
}
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
inline tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(typename tuple_type<A0>::transparent_reference a0<%1.upto(i) {|j|%>, typename tuple_type<A<%=j%>>::transparent_reference a<%=j%><%}%>)
@ -134,6 +145,7 @@ inline tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> make_tuple(typename tuple_type<
return tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>(a0<%1.upto(i) {|j|%>, a<%=j%><%}%>);
}
<%}%>
/// @endcond
} // namespace type
@ -149,6 +161,7 @@ struct convert<type::tuple<> > {
}
};
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
struct convert<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
@ -164,6 +177,7 @@ struct convert<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
}
};
<%}%>
/// @endcond
template <>
struct pack<type::tuple<> > {
@ -176,6 +190,7 @@ struct pack<type::tuple<> > {
}
};
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
struct pack<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
@ -190,6 +205,7 @@ struct pack<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
}
};
<%}%>
/// @endcond
template <>
struct object_with_zone<type::tuple<> > {
@ -202,6 +218,7 @@ struct object_with_zone<type::tuple<> > {
}
};
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
struct object_with_zone<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
@ -216,10 +233,13 @@ struct object_with_zone<type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> > {
}
};
<%}%>
/// @endcond
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

8
erb/cpp03_zone.hpp.erb
View File

@ -35,7 +35,9 @@
<% GENERATION_LIMIT = 15 %>
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
class zone {
struct finalizer {
@ -179,10 +181,12 @@ public:
{
::operator delete(p, place);
}
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename T<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
T* allocate(<%=(1..i).map{|j|"A#{j} a#{j}"}.join(', ')%>);
<%}%>
/// @endcond
private:
void undo_allocate(size_t size);
@ -304,6 +308,7 @@ inline void zone::undo_allocate(size_t size)
m_chunk_list.m_free += size;
}
/// @cond
<%0.upto(GENERATION_LIMIT) {|i|%>
template <typename T<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
T* zone::allocate(<%=(1..i).map{|j|"A#{j} a#{j}"}.join(', ')%>)
@ -324,8 +329,11 @@ T* zone::allocate(<%=(1..i).map{|j|"A#{j} a#{j}"}.join(', ')%>)
}
}
<%}%>
/// @endcond
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

5
include/msgpack/adaptor/adaptor_base.hpp
View File

@ -22,7 +22,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
template <typename Stream>
class packer;
@ -80,7 +82,10 @@ void operator<< (msgpack::object::with_zone& o, T const& v) {
adaptor::object_with_zone<T>()(o, v);
}
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/bool.hpp
View File

@ -23,7 +23,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -63,7 +65,9 @@ struct object_with_zone<bool> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/char_ptr.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -154,7 +156,9 @@ struct object<const char[N]> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/check_container_size.hpp
View File

@ -23,7 +23,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
struct container_size_overflow : public std::runtime_error {
explicit container_size_overflow(const std::string& msg)
@ -54,7 +56,9 @@ inline uint32_t checked_get_container_size(T size) {
}
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/cpp11/array.hpp
View File

@ -27,7 +27,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -80,7 +82,9 @@ struct object_with_zone<std::array<T, N>> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/cpp11/array_char.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -86,7 +88,9 @@ struct object_with_zone<std::array<char, N>> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/cpp11/forward_list.hpp
View File

@ -27,7 +27,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -76,7 +78,9 @@ struct object_with_zone<std::forward_list<T>> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/cpp11/tuple.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
// --- Pack from tuple to packer stream ---
template <typename Stream, typename Tuple, std::size_t N>
@ -163,7 +165,9 @@ struct object_with_zone<std::tuple<Args...>> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/cpp11/unordered_map.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -146,7 +148,9 @@ struct object_with_zone<std::unordered_multimap<K, V>> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/cpp11/unordered_set.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -139,7 +141,9 @@ struct object_with_zone<std::unordered_multiset<T>> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/deque.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -84,7 +86,9 @@ struct object_with_zone<std::deque<T> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

18
include/msgpack/adaptor/detail/cpp03_define.hpp
View File

@ -42,7 +42,9 @@
// MSGPACK_ADD_ENUM must be used in the global namespace.
#define MSGPACK_ADD_ENUM(enum_name) \
namespace msgpack { \
/** @cond */ \
MSGPACK_API_VERSION_NAMESPACE(v1) { \
/** @endcond */ \
namespace adaptor { \
template<> \
struct convert<enum_name> { \
@ -73,18 +75,22 @@
} \
}; \
} \
/** @cond */ \
} \
/** @endcond */ \
}
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
/// @cond
template <typename A0 = void, typename A1 = void, typename A2 = void, typename A3 = void, typename A4 = void, typename A5 = void, typename A6 = void, typename A7 = void, typename A8 = void, typename A9 = void, typename A10 = void, typename A11 = void, typename A12 = void, typename A13 = void, typename A14 = void, typename A15 = void, typename A16 = void, typename A17 = void, typename A18 = void, typename A19 = void, typename A20 = void, typename A21 = void, typename A22 = void, typename A23 = void, typename A24 = void, typename A25 = void, typename A26 = void, typename A27 = void, typename A28 = void, typename A29 = void, typename A30 = void, typename A31 = void, typename A32 = void>
struct define;
/// @endcond
template <>
struct define<> {
@ -107,6 +113,8 @@ struct define<> {
}
};
/// @cond
template <typename A0>
struct define<A0> {
typedef define<A0> value_type;
@ -3275,12 +3283,15 @@ struct define<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A
A31& a31;
};
/// @endcond
inline define<> make_define()
{
return define<>();
}
/// @cond
template <typename A0>
define<A0> make_define(A0& a0)
{
@ -3473,9 +3484,12 @@ define<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16
return define<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30, A31>(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25, a26, a27, a28, a29, a30, a31);
}
/// @endcond
} // namespace type
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

20
include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp
View File

@ -24,7 +24,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
@ -32,8 +34,10 @@ namespace type {
// FIXME operator!=
/// @cond
template <typename A0 = void, typename A1 = void, typename A2 = void, typename A3 = void, typename A4 = void, typename A5 = void, typename A6 = void, typename A7 = void, typename A8 = void, typename A9 = void, typename A10 = void, typename A11 = void, typename A12 = void, typename A13 = void, typename A14 = void, typename A15 = void, typename A16 = void, typename A17 = void, typename A18 = void, typename A19 = void, typename A20 = void, typename A21 = void, typename A22 = void, typename A23 = void, typename A24 = void, typename A25 = void, typename A26 = void, typename A27 = void, typename A28 = void, typename A29 = void, typename A30 = void, typename A31 = void, typename A32 = void>
struct tuple;
/// @endcond
template <typename Tuple, int N>
struct tuple_element;
@ -68,6 +72,7 @@ struct tuple_type<const T&> {
typedef const T& transparent_reference;
};
/// @cond
template <typename A0>
@ -9175,6 +9180,7 @@ private:
};
/// @endcond
template <>
struct tuple<> {
@ -9183,6 +9189,8 @@ struct tuple<> {
typedef tuple<> value_type;
};
/// @cond
template <typename A0>
struct tuple<A0> {
typedef tuple<A0> value_type;
@ -10383,12 +10391,15 @@ template <int N, typename A0, typename A1, typename A2, typename A3, typename A4
inline typename type::const_tuple_element<type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30, A31>, N>::const_reference get(type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30, A31> const& t)
{ return t.template get<N>(); }
/// @endcond
inline tuple<> make_tuple()
{
return tuple<>();
}
/// @cond
template <typename A0>
inline tuple<A0> make_tuple(typename tuple_type<A0>::transparent_reference a0)
{
@ -10581,6 +10592,7 @@ inline tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A1
return tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30, A31>(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22, a23, a24, a25, a26, a27, a28, a29, a30, a31);
}
/// @endcond
} // namespace type
@ -10596,6 +10608,7 @@ struct convert<type::tuple<> > {
}
};
/// @cond
template <typename A0>
struct convert<type::tuple<A0> > {
@ -12037,6 +12050,7 @@ struct convert<type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12
}
};
/// @endcond
template <>
struct pack<type::tuple<> > {
@ -12049,6 +12063,7 @@ struct pack<type::tuple<> > {
}
};
/// @cond
template <typename A0>
struct pack<type::tuple<A0> > {
@ -12962,6 +12977,7 @@ struct pack<type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A
}
};
/// @endcond
template <>
struct object_with_zone<type::tuple<> > {
@ -12974,6 +12990,7 @@ struct object_with_zone<type::tuple<> > {
}
};
/// @cond
template <typename A0>
struct object_with_zone<type::tuple<A0> > {
@ -13887,10 +13904,13 @@ struct object_with_zone<type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10,
}
};
/// @endcond
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

8
include/msgpack/adaptor/detail/cpp11_define.hpp
View File

@ -46,7 +46,9 @@
// MSGPACK_ADD_ENUM must be used in the global namespace.
#define MSGPACK_ADD_ENUM(enum_name) \
namespace msgpack { \
/** @cond */ \
MSGPACK_API_VERSION_NAMESPACE(v1) { \
/** @endcond */ \
namespace adaptor { \
template<> \
struct convert<enum_name> { \
@ -79,11 +81,15 @@
} \
}; \
} \
/** @cond */ \
} \
/** @endcond */ \
}
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
template <typename Tuple, std::size_t N>
@ -185,7 +191,9 @@ define<Args...> make_define(Args&... args)
}
} // namespace type
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack
#endif // MSGPACK_CPP11_DEFINE_HPP

4
include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
View File

@ -25,7 +25,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
// tuple
@ -224,7 +226,9 @@ template <typename... Args>
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
///@endcond
} // namespace msgpack

4
include/msgpack/adaptor/fixint.hpp
View File

@ -24,7 +24,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
@ -295,7 +297,9 @@ struct object_with_zone<type::fix_uint64> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/float.hpp
View File

@ -24,7 +24,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
// FIXME check overflow, underflow
@ -120,7 +122,9 @@ struct object_with_zone<double> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/int.hpp
View File

@ -24,7 +24,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1){
/// @endcond
namespace type {
namespace detail {
@ -425,7 +427,9 @@ struct object_with_zone<unsigned long long> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/list.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -84,7 +86,9 @@ struct object_with_zone<std::list<T> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/map.hpp
View File

@ -28,7 +28,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
@ -226,7 +228,9 @@ struct object_with_zone<std::multimap<K, V> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

5
include/msgpack/adaptor/nil.hpp
View File

@ -23,7 +23,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
@ -73,8 +75,9 @@ inline void msgpack::object::as<void>() const
convert(v);
}
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/pair.hpp
View File

@ -24,7 +24,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -64,7 +66,9 @@ struct object_with_zone<std::pair<T1, T2> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/raw.hpp
View File

@ -25,7 +25,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
@ -103,7 +105,9 @@ struct object_with_zone<msgpack::type::raw_ref> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/set.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -138,7 +140,9 @@ struct object_with_zone<std::multiset<T> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/string.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -83,7 +85,9 @@ struct object_with_zone<std::string> {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/tr1/unordered_map.hpp
View File

@ -45,7 +45,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -164,7 +166,9 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_multimap<K, V> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/tr1/unordered_set.hpp
View File

@ -45,7 +45,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -158,7 +160,9 @@ struct object_with_zone<MSGPACK_STD_TR1::unordered_multiset<T> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/vector.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -88,7 +90,9 @@ struct object_with_zone<std::vector<T> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/vector_bool.hpp
View File

@ -24,7 +24,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -85,7 +87,9 @@ struct object_with_zone<std::vector<bool> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/adaptor/vector_char.hpp
View File

@ -26,7 +26,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace adaptor {
@ -86,7 +88,9 @@ struct object_with_zone<std::vector<char> > {
} // namespace adaptor
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

8
include/msgpack/cpp_config.hpp
View File

@ -44,7 +44,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
template <typename T>
struct unique_ptr : std::auto_ptr<T> {
@ -75,7 +77,9 @@ template <typename T>
struct enable_if<false, T> {
};
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack
@ -86,7 +90,9 @@ struct enable_if<false, T> {
#include <tuple>
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
// unique_ptr
using std::unique_ptr;
@ -98,7 +104,9 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
using std::swap;
using std::enable_if;
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

8
include/msgpack/detail/cpp03_zone.hpp
View File

@ -35,7 +35,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
class zone {
struct finalizer {
@ -179,6 +181,7 @@ public:
{
::operator delete(p, place);
}
/// @cond
template <typename T>
T* allocate();
@ -228,6 +231,7 @@ public:
template <typename T, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15>
T* allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13, A14 a14, A15 a15);
/// @endcond
private:
void undo_allocate(size_t size);
@ -349,6 +353,7 @@ inline void zone::undo_allocate(size_t size)
m_chunk_list.m_free += size;
}
/// @cond
template <typename T>
T* zone::allocate()
@ -654,8 +659,11 @@ T* zone::allocate(A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9,
}
}
/// @endcond
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/detail/cpp11_zone.hpp
View File

@ -36,7 +36,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
class zone {
private:
@ -361,7 +363,9 @@ T* zone::allocate(Args... args)
}
}
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/fbuffer.hpp
View File

@ -25,7 +25,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
class fbuffer {
public:
@ -57,7 +59,9 @@ private:
FILE* m_file;
};
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/iterator.hpp
View File

@ -24,8 +24,10 @@
namespace msgpack
{
/// @cond
MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
{
/// @endcond
inline object_kv* begin(object_map &map) { return map.ptr; }
inline const object_kv* begin(const object_map &map) { return map.ptr; }
inline object_kv* end(object_map &map) { return map.ptr + map.size; }
@ -35,7 +37,9 @@ namespace msgpack
inline const object* begin(const object_array &array) { return array.ptr; }
inline object* end(object_array &array) { return array.ptr + array.size; }
inline const object* end(const object_array &array) { return array.ptr + array.size; }
/// @cond
}
/// @endcond
}
#endif // !defined(MSGPACK_USE_CPP03)

4
include/msgpack/object.hpp
View File

@ -32,7 +32,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
struct object::implicit_type {
implicit_type(object const& o) : obj(o) { }
@ -627,7 +629,9 @@ inline std::ostream& operator<< (std::ostream& s, const msgpack::object& o)
return s;
}
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/object_fwd.hpp
View File

@ -27,7 +27,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace type {
@ -150,7 +152,9 @@ private:
with_zone();
};
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/pack.hpp
View File

@ -30,7 +30,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
template <typename Stream>
class packer {
@ -1050,7 +1052,9 @@ inline void packer<Stream>::pack_imp_int64(T d)
}
}
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/sbuffer.hpp
View File

@ -28,7 +28,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
class sbuffer {
public:
@ -127,7 +129,9 @@ private:
size_t m_alloc;
};
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/unpack.hpp
View File

@ -64,7 +64,9 @@ const size_t COUNTER_SIZE = sizeof(_msgpack_atomic_counter_t);
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
typedef bool (*unpack_reference_func)(msgpack::type::object_type, std::size_t, void*);
@ -1727,7 +1729,9 @@ inline bool unpacker::default_reference_func(msgpack::type::object_type /*type*/
return true;
}
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/vrefbuffer.hpp
View File

@ -41,7 +41,9 @@ struct iovec {
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
namespace detail {
// int64, uint64, double
@ -289,7 +291,9 @@ private:
};
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
include/msgpack/zbuffer.hpp
View File

@ -33,7 +33,9 @@
namespace msgpack {
/// @cond
MSGPACK_API_VERSION_NAMESPACE(v1) {
/// @endcond
class zbuffer {
public:
@ -164,7 +166,9 @@ private:
size_t m_init_size;
};
/// @cond
} // MSGPACK_API_VERSION_NAMESPACE(v1)
/// @endcond
} // namespace msgpack

4
src/Makefile.am
View File

@ -114,6 +114,8 @@ doxygen_c:
cat ../Doxyfile > Doxyfile_c
echo "FILE_PATTERNS = *.h" >> Doxyfile_c
echo "OUTPUT_DIRECTORY = doc_c" >> Doxyfile_c
echo "INPUT = ../include" >> Doxyfile_c
echo "EXTRACT_ALL = YES" >> Doxyfile_c
echo "PROJECT_NAME = \"MessagePack for C\"" >> Doxyfile_c
doxygen Doxyfile_c
@ -121,6 +123,8 @@ doxygen_cpp:
cat ../Doxyfile > Doxyfile_cpp
echo "FILE_PATTERNS = *.hpp" >> Doxyfile_cpp
echo "OUTPUT_DIRECTORY = doc_cpp" >> Doxyfile_cpp
echo "INPUT = ../include" >> Doxyfile_cpp
echo "EXTRACT_ALL = YES" >> Doxyfile_cpp
echo "PROJECT_NAME = \"MessagePack for C++\"" >> Doxyfile_cpp
doxygen Doxyfile_cpp