Skip to content

Commit c55f778

Browse files
redboltzredboltz
committed
Fixed #534.
Added conditional [[deprecated]] attribute. Updated zlib version.
1 parent b4f2acb commit c55f778

File tree

11 files changed

+78
-9
lines changed

11 files changed

+78
-9
lines changed

‎appveyor.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ build_script:
3333
- cmake --build . --config Release
3434
- cd ..
3535
- cd ..
36-
- appveyor DownloadFile http://zlib.net/zlib-1.2.8.tar.gz -FileName zlib-1.2.8.tar.gz
37-
- 7z x zlib-1.2.8.tar.gz > NUL
38-
- 7z x zlib-1.2.8.tar > NUL
39-
- cd zlib-1.2.8
36+
- appveyor DownloadFile http://zlib.net/zlib-1.2.9.tar.gz -FileName zlib-1.2.9.tar.gz
37+
- 7z x zlib-1.2.9.tar.gz > NUL
38+
- 7z x zlib-1.2.9.tar > NUL
39+
- cd zlib-1.2.9
4040
- md build
4141
- cd build
4242
- cmake -G %msvc% ..
@@ -46,9 +46,9 @@ build_script:
4646
- cd ..
4747
- md build
4848
- cd build
49-
- cmake -G %msvc% %cpp11% %boost% -DMSGPACK_BOOST_DIR=C:\Libraries\\boost_1_60_0 -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
49+
- cmake -G %msvc% %cpp11% %boost% -DMSGPACK_BOOST_DIR=C:\Libraries\\boost_1_60_0 -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.9\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.9 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
5050
- cmake --build . --config Release
5151

5252
test_script:
53-
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.8\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
53+
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.9\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
5454
- ctest -V

‎include/msgpack/v1/cpp_config.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,10 @@ template<class T> struct is_pointer : detail::is_pointer_helper<typename remove_
126126

127127
#endif // MSGPACK_USE_CPP03
128128

129+
#if __cplusplus >= 201402L
130+
#define MSGPACK_DEPRECATED(msg) [[deprecated(msg)]]
131+
#else // __cplusplus >= 201402L
132+
#define MSGPACK_DEPRECATED(msg)
133+
#endif // __cplusplus >= 201402L
134+
129135
#endif // MSGPACK_V1_CPP_CONFIG_HPP

‎include/msgpack/v1/object.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ class object_handle {
6060
) :
6161
m_obj(obj), m_zone(msgpack::move(z)) { }
6262

63-
// obsolete
6463
void set(msgpack::object const& obj)
6564
{ m_obj = obj; }
6665

@@ -400,7 +399,6 @@ class define : public Type {
400399
public:
401400
typedef Type msgpack_type;
402401
typedef define<Type> define_type;
403-
404402
define() {}
405403
define(const msgpack_type& v) : msgpack_type(v) {}
406404

‎include/msgpack/v1/object_decl.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,17 @@ void operator<< (msgpack::object& o, const msgpack_object& v);
8585

8686
// obsolete
8787
template <typename T>
88+
MSGPACK_DEPRECATED("please use member function version of object::convert(T&)")
8889
void convert(T& v, msgpack::object const& o);
8990

9091
// obsolete
9192
template <typename Stream, typename T>
93+
MSGPACK_DEPRECATED("please use member function version of packer::pack(const T&)")
9294
void pack(msgpack::packer<Stream>& o, const T& v);
9395

9496
// obsolete
9597
template <typename Stream, typename T>
98+
MSGPACK_DEPRECATED("please use member function version of packer::pack(const T&)")
9699
void pack_copy(msgpack::packer<Stream>& o, T v);
97100

98101
template <typename Stream>

‎include/msgpack/v1/object_fwd.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ struct object {
7878
uint64_t u64;
7979
int64_t i64;
8080
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
81+
MSGPACK_DEPRECATED("please use f64 instead")
8182
double dec; // obsolete
8283
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
8384
double f64;
@@ -157,6 +158,7 @@ struct object {
157158
* @return The pointer of `v`.
158159
*/
159160
template <typename T>
161+
MSGPACK_DEPRECATED("please use reference version instead")
160162
typename msgpack::enable_if<
161163
msgpack::is_pointer<T>::value,
162164
T
@@ -214,6 +216,7 @@ struct object {
214216
* @param z The pointer to the zone that is used by the object.
215217
*/
216218
template <typename T>
219+
MSGPACK_DEPRECATED("please use zone reference version instead of the pointer version")
217220
object(const T& v, msgpack::zone* z);
218221

219222
template <typename T>

‎include/msgpack/v1/object_fwd_decl.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace type {
3434
FLOAT64 = MSGPACK_OBJECT_FLOAT64,
3535
FLOAT = MSGPACK_OBJECT_FLOAT,
3636
#if defined(MSGPACK_USE_LEGACY_NAME_AS_FLOAT)
37-
DOUBLE = MSGPACK_OBJECT_DOUBLE, // obsolete
37+
DOUBLE = MSGPACK_DEPRECATED("please use FLOAT64 instead") MSGPACK_OBJECT_DOUBLE, // obsolete
3838
#endif // MSGPACK_USE_LEGACY_NAME_AS_FLOAT
3939
STR = MSGPACK_OBJECT_STR,
4040
BIN = MSGPACK_OBJECT_BIN,

‎include/msgpack/v1/unpack.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,7 @@ class unpacker {
10111011
* This function is obsolete. Use the reference inteface version of next() function instead of
10121012
* the pointer interface version.
10131013
*/
1014+
MSGPACK_DEPRECATED("please use reference version instead")
10141015
bool next(msgpack::object_handle* result);
10151016

10161017
/// Unpack one msgpack::object.
@@ -1651,6 +1652,7 @@ inline msgpack::object unpack(
16511652

16521653
// obsolete
16531654
// pointer version
1655+
MSGPACK_DEPRECATED("please use reference version instead")
16541656
inline void unpack(
16551657
msgpack::object_handle* result,
16561658
const char* data, std::size_t len, std::size_t* off, bool* referenced,

‎test/convert.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,15 @@ TEST(convert, return_value_ptr)
9292
msgpack::object obj(1, z);
9393

9494
int i;
95+
// obsolete
96+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
97+
#pragma GCC diagnostic push
98+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
99+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
95100
EXPECT_EQ(obj.convert(&i), &i);
101+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
102+
#pragma GCC diagnostic pop
103+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
96104
EXPECT_EQ(1, i);
97105
}
98106

‎test/limit.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,15 @@ TEST(limit, unpack_array_over_off_ref_pointer)
518518
bool ref;
519519
std::size_t off = 0;
520520
msgpack::object_handle unp;
521+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
522+
#pragma GCC diagnostic push
523+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
524+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
521525
msgpack::unpack(&unp, ss.str().c_str(), ss.str().size(), &off, &ref, MSGPACK_NULLPTR, MSGPACK_NULLPTR,
522526
msgpack::unpack_limit(2, 0, 0, 0, 0));
527+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
528+
#pragma GCC diagnostic pop
529+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
523530
EXPECT_TRUE(false);
524531
}
525532
catch(msgpack::array_size_overflow const&) {

‎test/pack_unpack.cpp‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,14 @@ TEST(unpack, int_pointer_off_no_ref)
156156
std::size_t off = 0;
157157

158158
// obsolete
159+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
160+
#pragma GCC diagnostic push
161+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
162+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
159163
msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off);
164+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
165+
#pragma GCC diagnostic pop
166+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
160167
EXPECT_EQ(1, oh.get().as<int>());
161168
EXPECT_EQ(off, sbuf.size());
162169
}
@@ -170,7 +177,14 @@ TEST(unpack, int_pointer_off_no_ref_explicit)
170177
std::size_t off = 0;
171178

172179
// obsolete
180+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
181+
#pragma GCC diagnostic push
182+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
183+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
173184
msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off, MSGPACK_NULLPTR);
185+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
186+
#pragma GCC diagnostic pop
187+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
174188
EXPECT_EQ(1, oh.get().as<int>());
175189
EXPECT_EQ(off, sbuf.size());
176190
}
@@ -183,7 +197,14 @@ TEST(unpack, int_pointer_no_off_ref)
183197
bool referenced;
184198

185199
// obsolete
200+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
201+
#pragma GCC diagnostic push
202+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
203+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
186204
msgpack::unpack(&oh, sbuf.data(), sbuf.size(), MSGPACK_NULLPTR, &referenced);
205+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
206+
#pragma GCC diagnostic pop
207+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
187208
EXPECT_EQ(1, oh.get().as<int>());
188209
EXPECT_FALSE(referenced);
189210
}
@@ -197,7 +218,14 @@ TEST(unpack, int_pointer_off_ref)
197218
std::size_t off = 0;
198219

199220
// obsolete
221+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
222+
#pragma GCC diagnostic push
223+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
224+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
200225
msgpack::unpack(&oh, sbuf.data(), sbuf.size(), &off, &referenced);
226+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
227+
#pragma GCC diagnostic pop
228+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
201229
EXPECT_EQ(1, oh.get().as<int>());
202230
EXPECT_EQ(off, sbuf.size());
203231
EXPECT_FALSE(referenced);
@@ -211,7 +239,14 @@ TEST(unpack, int_default_null_pointer)
211239
msgpack::object_handle oh;
212240

213241
// obsolete
242+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
243+
#pragma GCC diagnostic push
244+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
245+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
214246
msgpack::unpack(&oh, sbuf.data(), sbuf.size());
247+
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
248+
#pragma GCC diagnostic pop
249+
#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))
215250
EXPECT_EQ(1, oh.get().as<int>());
216251
}
217252

0 commit comments

Comments
 (0)