diff options
Diffstat (limited to 'src/hwpf/include')
-rw-r--r-- | src/hwpf/include/plat/plat_error_scope.H | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/hwpf/include/plat/plat_error_scope.H b/src/hwpf/include/plat/plat_error_scope.H index ff03769d..bc5ad9f5 100644 --- a/src/hwpf/include/plat/plat_error_scope.H +++ b/src/hwpf/include/plat/plat_error_scope.H @@ -32,11 +32,19 @@ /// @cond #define PLAT_FAPI_TRY_NO_TRACE( __operation__ ) \ + if(std::is_same<decltype((__operation__)), fapi2::AttributeRC>::value) \ + { \ + (void)((__operation__)); \ + } \ + else \ + { \ if ((fapi2::current_err = (__operation__)) != fapi2::FAPI2_RC_SUCCESS) \ { \ goto fapi_try_exit; \ + } \ } + #define PLAT_FAPI_TRY_TRACE( __operation__, ... ) \ if ((fapi2::current_err = (__operation__)) != fapi2::FAPI2_RC_SUCCESS) \ { \ @@ -59,8 +67,8 @@ FAPI_ERR(__VA_ARGS__); \ goto fapi_try_exit; \ } - - + + /// /// @brief Temporary macro for error label until all are removed. /// @todo REMOVE this in time. |