diff options
author | David Young <dyoung@hdfgroup.org> | 2020-04-13 22:10:30 (GMT) |
---|---|---|
committer | David Young <dyoung@hdfgroup.org> | 2020-04-13 22:10:30 (GMT) |
commit | 43b8671231c027efcc7a2db25c06677fd205fa88 (patch) | |
tree | 13dcfeaede4e0dc66212e98c421cdacce93db7fe /src/hlog.h | |
parent | 03a91f3cf55349a81000c4cebf8d726980b6b220 (diff) | |
download | hdf5-43b8671231c027efcc7a2db25c06677fd205fa88.zip hdf5-43b8671231c027efcc7a2db25c06677fd205fa88.tar.gz hdf5-43b8671231c027efcc7a2db25c06677fd205fa88.tar.bz2 |
Change the prefix for hlog_outlet_t's from log_ to hlog_gbl_ to avoid
namespace pollution. Use a `#define HLOG_PREFIX hlog_gbl_` so that I
can change all of the prefixes in one place if need be.
Diffstat (limited to 'src/hlog.h')
-rw-r--r-- | src/hlog.h | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -70,7 +70,9 @@ void hlog_undefined_##__sym(void) _constructor #define HLOG_OUTLET_DECL1(__sym) extern struct hlog_outlet __sym -#define HLOG_OUTLET_DECL(__name) HLOG_OUTLET_DECL1(log_##__name) +#define HLOG_PREFIX hlog_gbl_ + +#define HLOG_OUTLET_DECL(__name) HLOG_OUTLET_DECL1(HLOG_PREFIX##__name) #define HLOG_OUTLET_DEFN(__sym, __name, __parent, __state) \ struct hlog_outlet __sym = { \ @@ -81,23 +83,23 @@ void hlog_undefined_##__sym(void) _constructor HLOG_CONSTRUCTOR(__sym) #define HLOG_OUTLET_MEDIUM_DEFN(__name, __parent, __state) \ - HLOG_OUTLET_DEFN(log_##__name, #__name, &log_##__parent, \ + HLOG_OUTLET_DEFN(HLOG_PREFIX##__name, #__name, &HLOG_PREFIX##__parent, \ __state) #define HLOG_OUTLET_SHORT_DEFN(__name, __parent) \ HLOG_OUTLET_MEDIUM_DEFN(__name, __parent, HLOG_OUTLET_S_PASS) #define HLOG_OUTLET_TOP_DEFN(__name) \ - HLOG_OUTLET_DEFN(log_##__name, #__name, NULL, HLOG_OUTLET_S_OFF) + HLOG_OUTLET_DEFN(HLOG_PREFIX##__name, #__name, NULL, HLOG_OUTLET_S_PASS) HLOG_OUTLET_DECL(all); #define hlog(_name, _fmt, ...) \ - hlog_impl(&log_##_name, _fmt, __VA_ARGS__) + hlog_impl(&HLOG_PREFIX##_name, _fmt, __VA_ARGS__) #define hlog_fast(_name, ...) \ do { \ - hlog_outlet_t *_ls0 = &log_##_name; \ + hlog_outlet_t *_ls0 = &HLOG_PREFIX##_name; \ \ if (_ls0->ls_resolved == HLOG_OUTLET_S_OFF) \ break; \ |