From e8112ac7e562bd9ae1935e60fb4e98a925d16587 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Fri, 13 Apr 2012 20:25:36 +0000
Subject: [PATCH] Handle std::string arguments in CFormat

---
 .svn-revision            | 2 +-
 src/libs/common/Format.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.svn-revision b/.svn-revision
index d3f3753d..7758e661 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-10774
+10775
diff --git a/src/libs/common/Format.h b/src/libs/common/Format.h
index 64a77bf4..f601864c 100644
--- a/src/libs/common/Format.h
+++ b/src/libs/common/Format.h
@@ -138,6 +138,7 @@ public:
 	// explicit overloads to avoid pass-by-value even in debug builds.
 	CFormat& operator%(const wxString& value)		{ return this->operator%<const wxString&>(value); }
 	CFormat& operator%(const CFormat& value)		{ return this->operator%<const wxString&>(value); }
+	CFormat& operator%(const std::string& value)	{ return this->operator%<const wxString&>(wxString(value.c_str(), wxConvUTF8)); }
 
 	/**
 	 * Returns the resulting string.
-- 
2.11.4.GIT