From 02aab60af4ebfadb0a51d44135c734d91430e11d Mon Sep 17 00:00:00 2001 From: pans <pans@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 09 八月 2017 10:39:03 +0800 Subject: [PATCH] update capnproto include file --- VisitFace/RtspNativeCodec/app/libs/capnproto/include/kj/array.h | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/libs/capnproto/include/kj/array.h b/VisitFace/RtspNativeCodec/app/libs/capnproto/include/kj/array.h index 3aa4ae2..51b5dcf 100644 --- a/VisitFace/RtspNativeCodec/app/libs/capnproto/include/kj/array.h +++ b/VisitFace/RtspNativeCodec/app/libs/capnproto/include/kj/array.h @@ -177,11 +177,6 @@ inline T& front() { return *ptr; } inline T& back() { return *(ptr + size_ - 1); } - template <typename U> - inline bool operator==(const U& other) const { return asPtr() == other; } - template <typename U> - inline bool operator!=(const U& other) const { return asPtr() != other; } - inline ArrayPtr<T> slice(size_t start, size_t end) { KJ_IREQUIRE(start <= end && end <= size_, "Out-of-bounds Array::slice()."); return ArrayPtr<T>(ptr + start, end - start); @@ -254,8 +249,6 @@ template <typename U> friend class Array; - template <typename U> - friend class ArrayBuilder; }; static_assert(!canMemcpy<Array<char>>(), "canMemcpy<>() is broken"); @@ -327,13 +320,6 @@ other.ptr = nullptr; other.pos = nullptr; other.endPtr = nullptr; - } - ArrayBuilder(Array<T>&& other) - : ptr(other.ptr), pos(other.ptr + other.size_), endPtr(pos), disposer(other.disposer) { - // Create an already-full ArrayBuilder from an Array of the same type. This constructor - // primarily exists to enable Vector<T> to be constructed from Array<T>. - other.ptr = nullptr; - other.size_ = 0; } KJ_DISALLOW_COPY(ArrayBuilder); inline ~ArrayBuilder() noexcept(false) { dispose(); } @@ -821,15 +807,6 @@ inline Array<T> heapArray(std::initializer_list<T> init) { return heapArray<T>(init.begin(), init.end()); } - -#if __cplusplus > 201402L -template <typename T, typename... Params> -inline Array<Decay<T>> arr(T&& param1, Params&&... params) { - ArrayBuilder<Decay<T>> builder = heapArrayBuilder<Decay<T>>(sizeof...(params) + 1); - (builder.add(kj::fwd<T>(param1)), ... , builder.add(kj::fwd<Params>(params))); - return builder.finish(); -} -#endif } // namespace kj -- Gitblit v1.8.0