leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ArgList::Map to the internal namespace and rename to ArgMap

Browse Source 
since it shouldn't be a part of the public API. Also break long lines.
This commit is contained in:
vitaut
2015-06-10 08:49:22 -07:00
parent 4325c155f7
commit a98583dde3
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
format.cc
+10 -8
View File
@@ -586,11 +586,13 @@ FMT_FUNC void fmt::internal::format_windows_error(
#endif
template <typename Char>
void fmt::ArgList::Map<Char>::init(const ArgList &args) {
void fmt::internal::ArgMap<Char>::init(const ArgList &args) {
if (!map_.empty())
return;
const internal::NamedArg<Char>* named_arg;
bool use_values = args.type(MAX_PACKED_ARGS - 1) == internal::Arg::NONE;
typedef internal::NamedArg<Char> NamedArg;
const NamedArg* named_arg = 0;
bool use_values =
args.type(ArgList::MAX_PACKED_ARGS - 1) == internal::Arg::NONE;
if (use_values) {
for (unsigned i = 0;/*nothing*/; ++i) {
internal::Arg::Type arg_type = args.type(i);
@@ -598,7 +600,7 @@ void fmt::ArgList::Map<Char>::init(const ArgList &args) {
case internal::Arg::NONE:
return;
case internal::Arg::NAMED_ARG:
named_arg = static_cast<const internal::NamedArg<Char>*>(args.values_[i].pointer);
named_arg = static_cast<const NamedArg*>(args.values_[i].pointer);
map_.insert(Pair(named_arg->name, *named_arg));
break;
default:
@@ -607,19 +609,19 @@ void fmt::ArgList::Map<Char>::init(const ArgList &args) {
}
return;
}
for (unsigned i = 0; i != MAX_PACKED_ARGS; ++i) {
for (unsigned i = 0; i != ArgList::MAX_PACKED_ARGS; ++i) {
internal::Arg::Type arg_type = args.type(i);
if (arg_type == internal::Arg::NAMED_ARG) {
named_arg = static_cast<const internal::NamedArg<Char>*>(args.args_[i].pointer);
named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
map_.insert(Pair(named_arg->name, *named_arg));
}
}
for (unsigned i = MAX_PACKED_ARGS;/*nothing*/; ++i) {
for (unsigned i = ArgList::MAX_PACKED_ARGS;/*nothing*/; ++i) {
switch (args.args_[i].type) {
case internal::Arg::NONE:
return;
case internal::Arg::NAMED_ARG:
named_arg = static_cast<const internal::NamedArg<Char>*>(args.args_[i].pointer);
named_arg = static_cast<const NamedArg*>(args.args_[i].pointer);
map_.insert(Pair(named_arg->name, *named_arg));
break;
default: