From 9b6b3382e3323a17d57ee2aa8a22264069a60f6a Mon Sep 17 00:00:00 2001
From: vitaut <victor.zverovich@gmail.com>
Date: Mon, 15 Jun 2015 07:15:28 -0700
Subject: [PATCH] Don't use ignore_incompatible_str in ArgFormatter

---
 format.cc | 7 +++++--
 format.h  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/format.cc b/format.cc
index bf7032bb..9aa3fc22 100644
--- a/format.cc
+++ b/format.cc
@@ -697,8 +697,11 @@ class fmt::internal::ArgFormatter :
   void visit_string(Arg::StringValue<char> value) {
     writer_.write_str(value, spec_);
   }
-  void visit_wstring(Arg::StringValue<wchar_t> value) {
-    writer_.write_str(ignore_incompatible_str<Char>(value), spec_);
+
+  using ArgVisitor<fmt::internal::ArgFormatter<Char>, void>::visit_wstring;
+
+  void visit_wstring(Arg::StringValue<Char> value) {
+    writer_.write_str(value, spec_);
   }
 
   void visit_pointer(const void *value) {
diff --git a/format.h b/format.h
index 4df755e4..ce8a7bc6 100644
--- a/format.h
+++ b/format.h
@@ -533,7 +533,7 @@ class CharTraits<char> : public BasicCharTraits<char> {
   // Conversion from wchar_t to char is not allowed.
   static char convert(wchar_t);
 
-public:
+ public:
   static char convert(char value) { return value; }
 
   // Formats a floating-point number.