generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-25 06:27:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_issue_167'

Browse Source
This commit is contained in:
Nobuyuki Kubota 2015-03-10 16:55:46 +09:00
commit 582fe38e78
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,22 @@ inline void operator<< (object& o, const char* v)
o.via.str.size = static_cast<uint32_t>(size); o.via.str.size = static_cast<uint32_t>(size);
} }
template <typename Stream>
inline packer<Stream>& operator<< (packer<Stream>& o, char* v)
{
return msgpack::operator<<(o, static_cast<const char*>(v));
}
inline void operator<< (object::with_zone& o, char* v)
{
msgpack::operator<<(o, static_cast<const char*>(v));
}
inline void operator<< (object& o, char* v)
{
msgpack::operator<<(o, static_cast<const char*>(v));
}
} // MSGPACK_API_VERSION_NAMESPACE(v1) } // MSGPACK_API_VERSION_NAMESPACE(v1)
} // namespace msgpack } // namespace msgpack

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

@ -31,6 +31,11 @@ packer<Stream>& operator<< (packer<Stream>& o, const char* v);
void operator<< (object::with_zone& o, const char* v); void operator<< (object::with_zone& o, const char* v);
void operator<< (object& o, const char* v); void operator<< (object& o, const char* v);
template <typename Stream>
packer<Stream>& operator<< (packer<Stream>& o, char* v);
void operator<< (object::with_zone& o, char* v);
void operator<< (object& o, char* v);
} // MSGPACK_API_VERSION_NAMESPACE(v1) } // MSGPACK_API_VERSION_NAMESPACE(v1)
} // namespace msgpack } // namespace msgpack

20
test/msgpack_basic.cpp
View File

@ -497,3 +497,23 @@ TEST(MSGPACK_STL, simple_buffer_cstring)
EXPECT_EQ(val1, val2); EXPECT_EQ(val1, val2);
} }
} }
TEST(MSGPACK_STL, simple_buffer_non_const_cstring)
{
for (unsigned int k = 0; k < kLoop; k++) {
string val1;
for (unsigned int i = 0; i < kElements; i++)
val1 += 'a' + rand() % 26;
msgpack::sbuffer sbuf;
char* s = new char[val1.size() + 1];
std::strcpy(s, val1.c_str());
msgpack::pack(sbuf, s);
delete [] s;
msgpack::unpacked ret;
msgpack::unpack(ret, sbuf.data(), sbuf.size());
EXPECT_EQ(ret.get().type, msgpack::type::STR);
string val2 = ret.get().as<string>();
EXPECT_EQ(val1.size(), val2.size());
EXPECT_EQ(val1, val2);
}
}