generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtc::Buffer: Accept void* in addition to the byte-sized types

Browse Source 
We used to accept void* (until 9478437f), and we'll have to continue
to do so for a little while longer, until Chromium doesn't need it
anymore.

TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/48179004

Cr-Commit-Position: refs/heads/master@{#9035}
This commit is contained in:
Karl Wiberg 2015-04-20 22:55:33 +02:00
parent 8c054154da
commit 011c00f708
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
webrtc/base/buffer.h
View File

@ -40,6 +40,20 @@ struct ByteType {
using t = decltype(F(static_cast<T*>(nullptr)));
};
// Deprecated: Accept void* in addition to the byte-sized types.
// TODO(kwiberg): Remove once Chromium doesn't need this anymore.
template <typename T>
struct ByteTypeOrVoid {
private:
static int F(uint8_t*);
static int F(int8_t*);
static int F(char*);
static int F(void*);
public:
using t = decltype(F(static_cast<T*>(nullptr)));
};
} // namespace internal
// Basic buffer class, can be grown and shrunk dynamically.
@ -56,10 +70,10 @@ class Buffer final {
// Construct a buffer and copy the specified number of bytes into it. The
// source array may be (const) uint8_t*, int8_t*, or char*.
template <typename T, typename internal::ByteType<T>::t = 0>
template <typename T, typename internal::ByteTypeOrVoid<T>::t = 0>
Buffer(const T* data, size_t size)
: Buffer(data, size, size) {}
template <typename T, typename internal::ByteType<T>::t = 0>
template <typename T, typename internal::ByteTypeOrVoid<T>::t = 0>
Buffer(const T* data, size_t size, size_t capacity)
: Buffer(size, capacity) {
std::memcpy(data_.get(), data, size);
@ -119,7 +133,7 @@ class Buffer final {
// Replace the contents of the buffer. Accepts the same types as the
// constructors.
template <typename T, typename internal::ByteType<T>::t = 0>
template <typename T, typename internal::ByteTypeOrVoid<T>::t = 0>
void SetData(const T* data, size_t size) {
assert(IsConsistent());
size_ = 0;
@ -132,7 +146,7 @@ class Buffer final {
void SetData(const Buffer& buf) { SetData(buf.data(), buf.size()); }
// Append data to the buffer. Accepts the same types as the constructors.
template <typename T, typename internal::ByteType<T>::t = 0>
template <typename T, typename internal::ByteTypeOrVoid<T>::t = 0>
void AppendData(const T* data, size_t size) {
assert(IsConsistent());
const size_t new_size = size_ + size;