diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-06-17 14:49:51 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-06-18 09:37:10 -0700 |
| commit | 6b52acc8502ec16e2d0b89d8caf6235ec45778cb (patch) | |
| tree | dd1efb15c5e20ee39aecce598b8e8099ceb99245 | |
| parent | 5e9a0a140a6474c2f66c61b3d4c21e7a8da2e7c4 (diff) | |
| download | ceph-6b52acc8502ec16e2d0b89d8caf6235ec45778cb.tar.gz | |
config.h: ensure U64 option defaults are computed as 64 bits
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/common/config.cc | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/common/config.cc b/src/common/config.cc index 319b9d5782d..5c64f4ec151 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -119,10 +119,30 @@ bool ceph_resolve_file_search(const std::string& filename_list, md_config_t::md_config_t() : cluster("ceph"), -#define OPTION(name, type, def_val) name(def_val), +#define OPTION_OPT_INT(name, def_val) name(def_val), +#define OPTION_OPT_LONGLONG(name, def_val) name((1LL) * def_val), +#define OPTION_OPT_STR(name, def_val) name(def_val), +#define OPTION_OPT_DOUBLE(name, def_val) name(def_val), +#define OPTION_OPT_FLOAT(name, def_val) name(def_val), +#define OPTION_OPT_BOOL(name, def_val) name(def_val), +#define OPTION_OPT_ADDR(name, def_val) name(def_val), +#define OPTION_OPT_U32(name, def_val) name(def_val), +#define OPTION_OPT_U64(name, def_val) name(((uint64_t)1) * def_val), +#define OPTION_OPT_UUID(name, def_val) name(def_val), +#define OPTION(name, type, def_val) OPTION_##type(name, def_val) #define SUBSYS(name, log, gather) #define DEFAULT_SUBSYS(log, gather) #include "common/config_opts.h" +#undef OPTION_OPT_INT +#undef OPTION_OPT_LONGLONG +#undef OPTION_OPT_STR +#undef OPTION_OPT_DOUBLE +#undef OPTION_OPT_FLOAT +#undef OPTION_OPT_BOOL +#undef OPTION_OPT_ADDR +#undef OPTION_OPT_U32 +#undef OPTION_OPT_U64 +#undef OPTION_OPT_UUID #undef OPTION #undef SUBSYS #undef DEFAULT_SUBSYS |