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

Merge branch 'add_std_prefix'

Browse Source 
Conflicts:
	include/msgpack/adaptor/char_ptr.hpp
	include/msgpack/adaptor/string.hpp
This commit is contained in:
Nobuyuki Kubota
2015-03-10 17:34:36 +09:00
parent c1e9f92d7f a4aa14d1e2
commit 8dae63e4c1
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ inline void operator<< (object::with_zone& o, const char* v)
char* ptr = static_cast<char*>(o.zone.allocate_align(size));
o.via.str.ptr = ptr;
o.via.str.size = size;
memcpy(ptr, v, size);
std::memcpy(ptr, v, size);
}
inline void operator<< (object& o, const char* v)