diff options
Diffstat (limited to 'chromium/third_party/tcmalloc/chromium/src/base/commandlineflags.h')
| -rw-r--r-- | chromium/third_party/tcmalloc/chromium/src/base/commandlineflags.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/chromium/third_party/tcmalloc/chromium/src/base/commandlineflags.h b/chromium/third_party/tcmalloc/chromium/src/base/commandlineflags.h index 649b95fa450..614be3a1a6b 100644 --- a/chromium/third_party/tcmalloc/chromium/src/base/commandlineflags.h +++ b/chromium/third_party/tcmalloc/chromium/src/base/commandlineflags.h @@ -59,13 +59,13 @@ #endif #define DECLARE_VARIABLE(type, name) \ - namespace FLAG__namespace_do_not_use_directly_use_DECLARE_##type##_instead { \ + namespace FLAG__namespace_do_not_use_directly_use_DECLARE_##type##_instead {\ extern PERFTOOLS_DLL_DECL type FLAGS_##name; \ } \ using FLAG__namespace_do_not_use_directly_use_DECLARE_##type##_instead::FLAGS_##name #define DEFINE_VARIABLE(type, name, value, meaning) \ - namespace FLAG__namespace_do_not_use_directly_use_DECLARE_##type##_instead { \ + namespace FLAG__namespace_do_not_use_directly_use_DECLARE_##type##_instead {\ PERFTOOLS_DLL_DECL type FLAGS_##name(value); \ char FLAGS_no##name; \ } \ @@ -100,16 +100,15 @@ #define DEFINE_double(name, value, meaning) \ DEFINE_VARIABLE(double, name, value, meaning) -// Special case for string, because we have to specify the namespace -// std::string, which doesn't play nicely with our FLAG__namespace hackery. +// Special case for string, because of the pointer type. #define DECLARE_string(name) \ namespace FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead { \ - extern std::string FLAGS_##name; \ + extern const char* FLAGS_##name; \ } \ using FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead::FLAGS_##name #define DEFINE_string(name, value, meaning) \ namespace FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead { \ - std::string FLAGS_##name(value); \ + const char* FLAGS_##name = value; \ char FLAGS_no##name; \ } \ using FLAG__namespace_do_not_use_directly_use_DECLARE_string_instead::FLAGS_##name @@ -119,6 +118,8 @@ // They are functions in Android because __system_property_get() doesn't // return a string. +#if defined(ENABLE_PROFILING) + #if defined(__ANDROID__) || defined(ANDROID) // Returns a pointer to a static variable. The string pointed by the returned @@ -178,4 +179,14 @@ inline double EnvToDouble(const char* envname, double dflt) { #endif // defined(__ANDROID__) || defined(ANDROID) +#else // defined(ENABLE_PROFILING) + +#define EnvToString(envname, dflt) (dflt) +#define EnvToBool(envname, dflt) (dflt) +#define EnvToInt(envname, dflt) (dflt) +#define EnvToInt64(envname, dflt) (dflt) +#define EnvToDouble(envname, dflt) (dflt) + +#endif // defined(ENABLE_PROFILING) + #endif // BASE_COMMANDLINEFLAGS_H_ |