| Index: third_party/tcmalloc/chromium/src/base/commandlineflags.h
|
| diff --git a/third_party/tcmalloc/chromium/src/base/commandlineflags.h b/third_party/tcmalloc/chromium/src/base/commandlineflags.h
|
| index 6d41e8643659c560d4e9425f6da67bb556a0c403..614be3a1a6bca90ebd621793f0c8c4033a5f7727 100644
|
| --- a/third_party/tcmalloc/chromium/src/base/commandlineflags.h
|
| +++ b/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
|
|
|