From 2fd120f201af7fa9f3140e7ac93326dcebc2bbc8 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 12 Nov 2019 11:28:09 +0300 Subject: [PATCH] add LOCATION_CSTR macro --- contrib/epee/include/misc_log_ex.h | 1 + contrib/epee/include/serialization/keyvalue_helpers.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/epee/include/misc_log_ex.h b/contrib/epee/include/misc_log_ex.h index d875fd3e..d4130d68 100644 --- a/contrib/epee/include/misc_log_ex.h +++ b/contrib/epee/include/misc_log_ex.h @@ -120,6 +120,7 @@ DISABLE_VS_WARNINGS(4100) #endif #define LOCATION_SS "[" << LOCAL_FUNCTION_DEF__ << ("] @ " __FILE__ ":" STR(__LINE__)) +#define LOCATION_CSTR ("[" LOCAL_FUNCTION_DEF__ "] @ " __FILE__ ":" STR(__LINE__)) #if !defined(DISABLE_RELEASE_LOGGING) #define ENABLE_LOGGING_INTERNAL diff --git a/contrib/epee/include/serialization/keyvalue_helpers.h b/contrib/epee/include/serialization/keyvalue_helpers.h index 0cf99221..61882816 100644 --- a/contrib/epee/include/serialization/keyvalue_helpers.h +++ b/contrib/epee/include/serialization/keyvalue_helpers.h @@ -64,7 +64,6 @@ namespace epee if (!epee::string_tools::hex_to_pod(a, res)) throw std::runtime_error(std::string("Unable to transform \"") + a + "\" to pod type " + typeid(t_pod_type).name()); return res; - CHECK_AND_ASSERT_THROW_MES } //basic helpers for blob-to-hex serialization