Merge 'upstream/master' - At least it builds...

This commit is contained in:
furrtek 2017-01-16 03:45:44 +00:00
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions

View file

@ -439,7 +439,7 @@ public:
return used_ >= capacity_;
}
const void* data() const {
void* data() const {
return data_;
}
@ -447,6 +447,10 @@ public:
return used_;
}
void set_size(const size_t value) {
used_ = value;
}
void empty() {
used_ = 0;
}