Add DECLARE_uint32 to gflags compatibility (#10729)

Summary:
Older versions of gflags do not have `DEFINE_uint32` and `DECLARE_uint32`. In util/gflag_compat.h, we already add a hack for `DEFINE_uint32`. This PR adds a hack for `DECLARE_uint32`.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/10729

Test Plan:
ROCKSDB_NO_FBCODE=1 make V=1 -j16 db_stress
make check

Resolves https://github.com/facebook/rocksdb/issues/10704

Reviewed By: pdillinger

Differential Revision: D39789183

Pulled By: riversand963

fbshipit-source-id: a58747e0163dcf55dd762733aa5c40d8f0ae70a6
main
Yanqin Jin 2 years ago committed by Facebook GitHub Bot
parent f3b359a549
commit d2578ab195
  1. 19
      util/gflags_compat.h

@ -6,6 +6,8 @@
#pragma once #pragma once
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <functional>
#ifndef GFLAGS_NAMESPACE #ifndef GFLAGS_NAMESPACE
// in case it's not defined in old versions, that's probably because it was // in case it's not defined in old versions, that's probably because it was
// still google by default. // still google by default.
@ -16,10 +18,13 @@
// DEFINE_uint32 does not appear in older versions of gflags. This should be // DEFINE_uint32 does not appear in older versions of gflags. This should be
// a sane definition for those versions. // a sane definition for those versions.
#include <cstdint> #include <cstdint>
#define DEFINE_uint32(name, val, txt) \ #define DEFINE_uint32(name, val, txt) \
namespace gflags_compat { \ namespace gflags_compat { \
DEFINE_int32(name, val, txt); \ DEFINE_int32(name, val, txt); \
} \ } \
uint32_t &FLAGS_##name = \ std::reference_wrapper<uint32_t> FLAGS_##name = \
*reinterpret_cast<uint32_t *>(&gflags_compat::FLAGS_##name); std::ref(*reinterpret_cast<uint32_t *>(&gflags_compat::FLAGS_##name));
#endif
#define DECLARE_uint32(name) \
extern std::reference_wrapper<uint32_t> FLAGS_##name;
#endif // !DEFINE_uint32

Loading…
Cancel
Save