From 567578415bf3127937a5028f08a03e4665607d90 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Mon, 20 Jun 2022 11:07:11 +0000 Subject: [PATCH] - fixed Buffer for PROCESSOR_BUFFER_USE_EXCEPTIONS not defined git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@1044 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- radio/processor/src/Buffer.hpp | 5 +++-- radio/processor/src/Buffer.tcc | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/radio/processor/src/Buffer.hpp b/radio/processor/src/Buffer.hpp index 43ddaba..ea972f1 100644 --- a/radio/processor/src/Buffer.hpp +++ b/radio/processor/src/Buffer.hpp @@ -6,10 +6,11 @@ #include #include -#define EXC_MSG(code) (std::string(__PRETTY_FUNCTION__) + ", line " + std::to_string(__LINE__) + ", code " + std::to_string(code)) +#define EXC_MSG(code) (std::string(__PRETTY_FUNCTION__) + ", line " + std::to_string(__LINE__) + ", code " + std::to_string(code)) +#define EXC_EXCEPT(code) throw Buffer::Exception(EXC_MSG(code)) #ifdef PROCESSOR_BUFFER_USE_EXCEPTIONS -#define RETURN_OR_EXCEPT(code) throw Buffer::Exception(EXC_MSG(code)) +#define RETURN_OR_EXCEPT(code) EXC_EXCEPT(code) #else #define RETURN_OR_EXCEPT(code) return code #endif diff --git a/radio/processor/src/Buffer.tcc b/radio/processor/src/Buffer.tcc index c75b529..3c077c8 100644 --- a/radio/processor/src/Buffer.tcc +++ b/radio/processor/src/Buffer.tcc @@ -98,9 +98,9 @@ typename Buffer::Result Buffer::write(const T *pData, size_t len) { if (len > free()) { - printf("len : %u\n", len); - printf("free : %u\n", free()); - printf("capa : %u\n", capacity()); + printf("len : %u\n", (unsigned)len); + printf("free : %u\n", (unsigned)free()); + printf("capa : %u\n", (unsigned)capacity()); RETURN_OR_EXCEPT(Result::Err_InvalidSize); } @@ -143,7 +143,7 @@ T Buffer::readAt(size_t offset) { if (m_len < (1+offset)) { - RETURN_OR_EXCEPT(Result::Err_InvalidSize); + EXC_EXCEPT(Result::Err_InvalidSize); } size_t i = (m_ri + offset) % m_capacity; T result = bufferActive()[i];