generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-14 23:07:58 +02:00
Code Issues Projects Releases Wiki Activity

Fixed #534.

Browse Source 
Added conditional [[deprecated]] attribute.
Updated zlib version.
This commit is contained in:
Takatoshi Kondo
2017-01-02 19:15:05 +09:00
parent b4f2acb945
commit c55f778198
11 changed files with 78 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/msgpack/v1/cpp_config.hpp
View File

@@ -126,4 +126,10 @@ template<class T> struct is_pointer : detail::is_pointer_helper<typename remove_
#endif // MSGPACK_USE_CPP03
#if __cplusplus >= 201402L
#define MSGPACK_DEPRECATED(msg) [[deprecated(msg)]]
#else // __cplusplus >= 201402L
#define MSGPACK_DEPRECATED(msg)
#endif // __cplusplus >= 201402L
#endif // MSGPACK_V1_CPP_CONFIG_HPP

2
include/msgpack/v1/object.hpp
View File

@@ -60,7 +60,6 @@ public:
) :
m_obj(obj), m_zone(msgpack::move(z)) { }
// obsolete
void set(msgpack::object const& obj)
{ m_obj = obj; }
@@ -400,7 +399,6 @@ class define : public Type {
public:
typedef Type msgpack_type;
typedef define<Type> define_type;
define() {}
define(const msgpack_type& v) : msgpack_type(v) {}

3
include/msgpack/v1/object_decl.hpp
View File

@@ -85,14 +85,17 @@ void operator<< (msgpack::object& o, const msgpack_object& v);
// obsolete
template <typename T>
MSGPACK_DEPRECATED("please use member function version of object::convert(T&)")
void convert(T& v, msgpack::object const& o);
// obsolete
template <typename Stream, typename T>
MSGPACK_DEPRECATED("please use member function version of packer::pack(const T&)")
void pack(msgpack::packer<Stream>& o, const T& v);
// obsolete
template <typename Stream, typename T>
MSGPACK_DEPRECATED("please use member function version of packer::pack(const T&)")
void pack_copy(msgpack::packer<Stream>& o, T v);
template <typename Stream>

3
include/msgpack/v1/object_fwd.hpp
View File

@@ -78,6 +78,7 @@ struct object {
uint64_t u64;
int64_t i64;
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
MSGPACK_DEPRECATED("please use f64 instead")
double dec; // obsolete
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
double f64;
@@ -157,6 +158,7 @@ struct object {
* @return The pointer of `v`.
*/
template <typename T>
MSGPACK_DEPRECATED("please use reference version instead")
typename msgpack::enable_if<
msgpack::is_pointer<T>::value,
T
@@ -214,6 +216,7 @@ struct object {
* @param z The pointer to the zone that is used by the object.
*/
template <typename T>
MSGPACK_DEPRECATED("please use zone reference version instead of the pointer version")
object(const T& v, msgpack::zone* z);
template <typename T>

2
include/msgpack/v1/object_fwd_decl.hpp
View File

@@ -34,7 +34,7 @@ namespace type {
FLOAT64 = MSGPACK_OBJECT_FLOAT64,
FLOAT = MSGPACK_OBJECT_FLOAT,
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
DOUBLE = MSGPACK_OBJECT_DOUBLE, // obsolete
DOUBLE = MSGPACK_DEPRECATED("please use FLOAT64 instead") MSGPACK_OBJECT_DOUBLE, // obsolete
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
STR = MSGPACK_OBJECT_STR,
BIN = MSGPACK_OBJECT_BIN,

2
include/msgpack/v1/unpack.hpp
View File

@@ -1011,6 +1011,7 @@ public:
* This function is obsolete. Use the reference inteface version of next() function instead of
* the pointer interface version.
*/
MSGPACK_DEPRECATED("please use reference version instead")
bool next(msgpack::object_handle* result);
/// Unpack one msgpack::object.
@@ -1651,6 +1652,7 @@ inline msgpack::object unpack(
// obsolete
// pointer version
MSGPACK_DEPRECATED("please use reference version instead")
inline void unpack(
msgpack::object_handle* result,
const char* data, std::size_t len, std::size_t* off, bool* referenced,