diff --git a/src/decoder_allocators.hpp b/src/decoder_allocators.hpp index f6b967be..2620f1b8 100644 --- a/src/decoder_allocators.hpp +++ b/src/decoder_allocators.hpp @@ -58,7 +58,8 @@ class c_single_allocator std::size_t size () const { return _buf_size; } - void resize (std::size_t new_size_) { _buf_size = new_size_; } + // This buffer is fixed, size must not be changed + void resize (std::size_t new_size_) { LIBZMQ_UNUSED (new_size_); } private: std::size_t _buf_size; diff --git a/tests/testutil.cpp b/tests/testutil.cpp index 4c7e9e89..971159a3 100644 --- a/tests/testutil.cpp +++ b/tests/testutil.cpp @@ -233,10 +233,12 @@ void setup_test_environment (int timeout_seconds_) // abort test after 121 seconds alarm (121); #else +#if !defined ZMQ_DISABLE_TEST_TIMEOUT // abort test after timeout_seconds_ seconds alarm (timeout_seconds_); #endif #endif +#endif #if defined __MVS__ // z/OS UNIX System Services: Ignore SIGPIPE during test runs, as a // workaround for no SO_NOGSIGPIPE socket option.