fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 03:07:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't bring Arg struct into global namespace

Browse Source 
This fixes compiling fmtlib in header-only mode when user code also has
something called 'Arg' defined. Now qualifying Arg struct with internal
namespace.
This commit is contained in:
Sean LK
2017-03-05 23:04:12 +00:00
committed by Victor Zverovich
parent cc736e7611
commit e3b5d806a8
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fmt/format.cc
View File

@ -50,8 +50,6 @@
# endif # endif
#endif #endif
using fmt::internal::Arg;
#if FMT_EXCEPTIONS #if FMT_EXCEPTIONS
# define FMT_TRY try # define FMT_TRY try
# define FMT_CATCH(x) catch (x) # define FMT_CATCH(x) catch (x)
@ -455,14 +453,14 @@ void internal::FixedBuffer<Char>::grow(std::size_t) {
FMT_THROW(std::runtime_error("buffer overflow")); FMT_THROW(std::runtime_error("buffer overflow"));
} }
FMT_FUNC Arg internal::FormatterBase::do_get_arg( FMT_FUNC internal::Arg internal::FormatterBase::do_get_arg(
unsigned arg_index, const char *&error) { unsigned arg_index, const char *&error) {
Arg arg = args_[arg_index]; internal::Arg arg = args_[arg_index];
switch (arg.type) { switch (arg.type) {
case Arg::NONE: case internal::Arg::NONE:
error = "argument index out of range"; error = "argument index out of range";
break; break;
case Arg::NAMED_ARG: case internal::Arg::NAMED_ARG:
arg = *static_cast<const internal::Arg*>(arg.pointer); arg = *static_cast<const internal::Arg*>(arg.pointer);
break; break;
default: default: