Commit 10caa99e authored by Craig Silverstein's avatar Craig Silverstein

Add back in a backwards-compatible constructor for
FlagRegisterer.

Because this backwards-compatible API is intended to be
short-lived, I did it in the simplest, least invasive way
possible, which involved cutting-and-pasting.

R=ncalvin,jkline
DELTA=27  (27 added, 0 deleted, 0 changed)


Revision created by MOE tool push_codebase.
MOE_MIGRATION=3065


git-svn-id: https://gflags.googlecode.com/svn/trunk@62 6586e3c6-dcc4-952a-343f-ff74eb82781d
parent 874aed5d
......@@ -1421,6 +1421,25 @@ FlagRegisterer::FlagRegisterer(const char* name, const char* type,
FlagRegistry::GlobalRegistry()->RegisterFlag(flag); // default registry
}
// TODO(csilvers): remove this by 1 Sept 2011.
FlagRegisterer::FlagRegisterer(const char* name, const char* type,
const char* help, const char* filename,
void* current_storage, void* defvalue_storage) {
if (help == NULL)
help = "";
// FlagValue expects the type-name to not include any namespace
// components, so we get rid of those, if any.
if (strchr(type, ':'))
type = strrchr(type, ':') + 1;
FlagValue* current = new FlagValue(current_storage, type, false);
FlagValue* defvalue = new FlagValue(defvalue_storage, type, false);
// Importantly, flag_ will never be deleted, so storage is always good.
CommandLineFlag* flag = new CommandLineFlag(name, help, filename,
NULL, current, defvalue);
FlagRegistry::GlobalRegistry()->RegisterFlag(flag); // default registry
}
// --------------------------------------------------------------------
// GetAllFlags()
// The main way the FlagRegistry class exposes its data. This
......
......@@ -432,6 +432,11 @@ class GFLAGS_DLL_DECL FlagRegisterer {
const char* help, const char* filename,
void* current_storage, void* defvalue_storage,
const fL::OptionalDefineArgs& optional_args);
// TODO(csilvers): remove this (and its impl in the .cc file),
// once all callers have been updated to the new form:
FlagRegisterer(const char* name, const char* type,
const char* help, const char* filename,
void* current_storage, void* defvalue_storage);
};
// If your application #defines STRIP_FLAG_HELP to a non-zero value
......
......@@ -436,6 +436,11 @@ class GFLAGS_DLL_DECL FlagRegisterer {
const char* help, const char* filename,
void* current_storage, void* defvalue_storage,
const fL::OptionalDefineArgs& optional_args);
// TODO(csilvers): remove this (and its impl in the .cc file),
// once all callers have been updated to the new form:
FlagRegisterer(const char* name, const char* type,
const char* help, const char* filename,
void* current_storage, void* defvalue_storage);
};
// If your application #defines STRIP_FLAG_HELP to a non-zero value
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment