[patches] [fix 1/1] fix: Broken compilation with gcc 4.6

imarkov imarkov at tarantool.org
Mon Jan 29 19:04:01 MSK 2018


* Delete contructor delegation in ClientError
* Move code body from one contructor to another

Signed-off-by: imarkov <imarkov at tarantool.org>
---
 src/box/error.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/box/error.cc b/src/box/error.cc
index 647b17e..99f5195 100644
--- a/src/box/error.cc
+++ b/src/box/error.cc
@@ -110,8 +110,11 @@ ClientError::ClientError(const type_info *type, const char *file, unsigned line,
 
 ClientError::ClientError(const char *file, unsigned line,
 			 uint32_t errcode, ...)
-	:ClientError(&type_ClientError, file, line, errcode)
+	:Exception(&type_ClientError, file, line)
 {
+	m_errcode = errcode;
+	if (rmean_error)
+		rmean_collect(rmean_error, RMEAN_ERROR, 1);
 	va_list ap;
 	va_start(ap, errcode);
 	error_vformat_msg(this, tnt_errcode_desc(m_errcode), ap);
-- 
2.7.4




More information about the Tarantool-patches mailing list