walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

src: Use std::copy instead of std::copy_n since gcc-4.7 does not have it

This commit is contained in:
Tatsuhiro Tsujikawa 2015-02-05 23:42:50 +09:00
parent ab6663c785
commit 9a2d36fc6c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/buffer.h
View File

@ -43,7 +43,8 @@ template <size_t N> struct Buffer {
// |src|. Returns number of bytes written. // |src|. Returns number of bytes written.
size_t write(const void *src, size_t count) { size_t write(const void *src, size_t count) {
count = std::min(count, wleft()); count = std::min(count, wleft());
last = std::copy_n(static_cast<const uint8_t *>(src), count, last); auto p = static_cast<const uint8_t *>(src);
last = std::copy(p, p + count, last);
return count; return count;
} }
size_t write(size_t count) { size_t write(size_t count) {

4
src/memchunk.h
View File

@ -134,7 +134,7 @@ template <typename Memchunk> struct Memchunks {
for (;;) { for (;;) {
auto n = std::min(static_cast<size_t>(last - first), tail->left()); auto n = std::min(static_cast<size_t>(last - first), tail->left());
tail->last = std::copy_n(first, n, tail->last); tail->last = std::copy(first, first + n, tail->last);
first += n; first += n;
len += n; len += n;
if (first == last) { if (first == last) {
@ -165,7 +165,7 @@ template <typename Memchunk> struct Memchunks {
auto n = std::min(static_cast<size_t>(last - first), m->len()); auto n = std::min(static_cast<size_t>(last - first), m->len());
assert(m->len()); assert(m->len());
first = std::copy_n(m->pos, n, first); first = std::copy(m->pos, m->pos + n, first);
m->pos += n; m->pos += n;
len -= n; len -= n;
if (m->len() > 0) { if (m->len() > 0) {