diff options
Diffstat (limited to 'src/H5FDsubfiling/mercury/src/util/mercury_util_error.h')
-rw-r--r-- | src/H5FDsubfiling/mercury/src/util/mercury_util_error.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/H5FDsubfiling/mercury/src/util/mercury_util_error.h b/src/H5FDsubfiling/mercury/src/util/mercury_util_error.h index 9004c5a..b5cb5cc 100644 --- a/src/H5FDsubfiling/mercury/src/util/mercury_util_error.h +++ b/src/H5FDsubfiling/mercury/src/util/mercury_util_error.h @@ -1,5 +1,6 @@ /** - * Copyright (c) 2013-2021 UChicago Argonne, LLC and The HDF Group. + * Copyright (c) 2013-2022 UChicago Argonne, LLC and The HDF Group. + * Copyright (c) 2022-2023 Intel Corporation. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,17 +10,6 @@ #include "mercury_util_config.h" -/* Default error macro */ -#include <mercury_log.h> -extern HG_UTIL_PRIVATE HG_LOG_OUTLET_DECL(hg_util); -#define HG_UTIL_LOG_ERROR(...) HG_LOG_WRITE(hg_util, HG_LOG_LEVEL_ERROR, __VA_ARGS__) -#define HG_UTIL_LOG_WARNING(...) HG_LOG_WRITE(hg_util, HG_LOG_LEVEL_WARNING, __VA_ARGS__) -#ifdef HG_UTIL_HAS_DEBUG -#define HG_UTIL_LOG_DEBUG(...) HG_LOG_WRITE(hg_util, HG_LOG_LEVEL_DEBUG, __VA_ARGS__) -#else -#define HG_UTIL_LOG_DEBUG(...) (void)0 -#endif - /* Branch predictor hints */ #ifndef _WIN32 #define likely(x) __builtin_expect(!!(x), 1) @@ -38,7 +28,6 @@ extern HG_UTIL_PRIVATE HG_LOG_OUTLET_DECL(hg_util); #define HG_UTIL_GOTO_ERROR(label, ret, err_val, ...) \ do { \ - HG_UTIL_LOG_ERROR(__VA_ARGS__); \ ret = err_val; \ goto label; \ } while (0) @@ -47,7 +36,6 @@ extern HG_UTIL_PRIVATE HG_LOG_OUTLET_DECL(hg_util); #define HG_UTIL_CHECK_ERROR(cond, label, ret, err_val, ...) \ do { \ if (unlikely(cond)) { \ - HG_UTIL_LOG_ERROR(__VA_ARGS__); \ ret = err_val; \ goto label; \ } \ @@ -56,24 +44,8 @@ extern HG_UTIL_PRIVATE HG_LOG_OUTLET_DECL(hg_util); #define HG_UTIL_CHECK_ERROR_NORET(cond, label, ...) \ do { \ if (unlikely(cond)) { \ - HG_UTIL_LOG_ERROR(__VA_ARGS__); \ goto label; \ } \ } while (0) -#define HG_UTIL_CHECK_ERROR_DONE(cond, ...) \ - do { \ - if (unlikely(cond)) { \ - HG_UTIL_LOG_ERROR(__VA_ARGS__); \ - } \ - } while (0) - -/* Check for cond and print warning */ -#define HG_UTIL_CHECK_WARNING(cond, ...) \ - do { \ - if (unlikely(cond)) { \ - HG_UTIL_LOG_WARNING(__VA_ARGS__); \ - } \ - } while (0) - #endif /* MERCURY_UTIL_ERROR_H */ |