From e3b5d806a8583f14929ae7ca119dce5da09f0ec1 Mon Sep 17 00:00:00 2001
From: Sean LK <sean@logicalknight.com>
Date: Sun, 5 Mar 2017 23:04:12 +0000
Subject: [PATCH] Don't bring Arg struct into global namespace

This fixes compiling fmtlib in header-only mode when user code also has
something called 'Arg' defined. Now qualifying Arg struct with internal
namespace.
---
 fmt/format.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fmt/format.cc b/fmt/format.cc
index c349e00e..494a4a71 100644
--- a/fmt/format.cc
+++ b/fmt/format.cc
@@ -50,8 +50,6 @@
 # endif
 #endif
 
-using fmt::internal::Arg;
-
 #if FMT_EXCEPTIONS
 # define FMT_TRY try
 # 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_FUNC Arg internal::FormatterBase::do_get_arg(
+FMT_FUNC internal::Arg internal::FormatterBase::do_get_arg(
     unsigned arg_index, const char *&error) {
-  Arg arg = args_[arg_index];
+  internal::Arg arg = args_[arg_index];
   switch (arg.type) {
-  case Arg::NONE:
+  case internal::Arg::NONE:
     error = "argument index out of range";
     break;
-  case Arg::NAMED_ARG:
+  case internal::Arg::NAMED_ARG:
     arg = *static_cast<const internal::Arg*>(arg.pointer);
     break;
   default: