From da1f5626cbad0aef3aac06ca5ffff9f6a6eb3fbe Mon Sep 17 00:00:00 2001 From: sjsujinkim Date: Fri, 23 Mar 2018 17:27:20 +0900 Subject: [PATCH] Disable details::logAlwaysFatal This commit disables details::logAlwaysFatal. If we use 'hidl_vec', we will meet unreferenced error now. Signed-off-by: sjsujinkim --- .../ref/nn/depend/libhidl/base/include/hidl/HidlSupport.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/runtime/ref/nn/depend/libhidl/base/include/hidl/HidlSupport.h b/src/runtime/ref/nn/depend/libhidl/base/include/hidl/HidlSupport.h index f526db9..f51f6b3 100644 --- a/src/runtime/ref/nn/depend/libhidl/base/include/hidl/HidlSupport.h +++ b/src/runtime/ref/nn/depend/libhidl/base/include/hidl/HidlSupport.h @@ -325,7 +325,9 @@ struct hidl_vec { hidl_vec(const std::initializer_list list) : mOwnsBuffer(true) { if (list.size() > UINT32_MAX) { +#if 0 // TODO-NNRT : Implement dummy logAlwaysFatal details::logAlwaysFatal("hidl_vec can't hold more than 2^32 elements."); +#endif } mSize = static_cast(list.size()); mBuffer = new T[mSize]; @@ -347,10 +349,14 @@ struct hidl_vec { hidl_vec(InputIterator first, InputIterator last) : mOwnsBuffer(true) { auto size = std::distance(first, last); if (size > static_cast(UINT32_MAX)) { +#if 0 // TODO-NNRT : Implement dummy logAlwaysFatal details::logAlwaysFatal("hidl_vec can't hold more than 2^32 elements."); +#endif } if (size < 0) { +#if 0 // TODO-NNRT : Implement dummy logAlwaysFatal details::logAlwaysFatal("size can't be negative."); +#endif } mSize = static_cast(size); mBuffer = new T[mSize]; @@ -377,7 +383,9 @@ struct hidl_vec { } mBuffer = data; if (size > UINT32_MAX) { +#if 0 // TODO-NNRT : Implement dummy logAlwaysFatal details::logAlwaysFatal("external vector size exceeds 2^32 elements."); +#endif } mSize = static_cast(size); mOwnsBuffer = shouldOwn; @@ -471,7 +479,9 @@ struct hidl_vec { void resize(size_t size) { if (size > UINT32_MAX) { +#if 0 // TODO-NNRT : Implement dummy logAlwaysFatal details::logAlwaysFatal("hidl_vec can't hold more than 2^32 elements."); +#endif } T *newBuffer = new T[size]; -- 2.7.4