feedc0de/espcpputils
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fixed unique symbol name for result inside macro

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-08-06 17:10:51 +02:00
parent 78fa43edcf
commit 0b9e04db92
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/espcppmacros.h
View File

@ -3,19 +3,19 @@
namespace espcpputils { namespace espcpputils {
#define CALL_AND_EXIT_ON_ERROR(METHOD, ...) \ #define CALL_AND_EXIT_ON_ERROR(METHOD, ...) \
if (const auto result = METHOD(__VA_ARGS__); result != ESP_OK) \ if (const auto result##__LINE__ = METHOD(__VA_ARGS__); result##__LINE__ != ESP_OK) \
{ \ { \
ESP_LOGE(TAG, "%s() failed with %s", #METHOD, esp_err_to_name(result)); \ ESP_LOGE(TAG, "%s() failed with %s", #METHOD, esp_err_to_name(result##__LINE__)); \
return result; \ return result##__LINE__; \
} }
#define CALL_AND_EXIT(METHOD, ...) \ #define CALL_AND_EXIT(METHOD, ...) \
if (const auto result = METHOD(__VA_ARGS__); result != ESP_OK) \ if (const auto result##__LINE__ = METHOD(__VA_ARGS__); result##__LINE__ != ESP_OK) \
{ \ { \
ESP_LOGE(TAG, "%s() failed with %s", #METHOD, esp_err_to_name(result)); \ ESP_LOGE(TAG, "%s() failed with %s", #METHOD, esp_err_to_name(result##__LINE__)); \
return result; \ return result##__LINE__; \
} \ } \
else \ else \
return result; return result##__LINE__;
} // namespace espcpputils } // namespace espcpputils