From 4b86848ea7aeececf7c17a6f94096759918d10e4 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Thu, 22 Apr 2010 20:49:46 +0000
Subject: [PATCH] Upstream tarball 10099

---
 .svn-revision            |  2 +-
 src/libs/common/Format.h | 77 +++++++-----------------------------------------
 2 files changed, 11 insertions(+), 68 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index f6fdbb24..027787a5 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-10098
+10099
diff --git a/src/libs/common/Format.h b/src/libs/common/Format.h
index ffa1c64f..c94d3b2e 100644
--- a/src/libs/common/Format.h
+++ b/src/libs/common/Format.h
@@ -25,16 +25,8 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-
 #include "MuleDebug.h"
 
-#ifdef __GNUC__
-    #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#else
-    /* Assume that other compilers don't have this bug */
-    #define GCC_VERSION	99999
-#endif
-
 
 /**
  * Classes that implement this interface are usable as
@@ -123,19 +115,19 @@ public:
 	 */
 	// \{
 	CFormat& operator%(wxChar value);
-	CFormat& operator%(signed short value);
-	CFormat& operator%(unsigned short value);
-	CFormat& operator%(signed int value);
-	CFormat& operator%(unsigned int value);
-	CFormat& operator%(signed long value);
-	CFormat& operator%(unsigned long value);
+	CFormat& operator%(signed short value)		{ return *this % (signed long long)value; }
+	CFormat& operator%(unsigned short value)	{ return *this % (unsigned long long)value; }
+	CFormat& operator%(signed int value)		{ return *this % (signed long long)value; }
+	CFormat& operator%(unsigned int value)		{ return *this % (unsigned long long)value; }
+	CFormat& operator%(signed long value)		{ return *this % (signed long long)value; }
+	CFormat& operator%(unsigned long value)		{ return *this % (unsigned long long)value; }
 	CFormat& operator%(signed long long value);
-	CFormat& operator%(unsigned long long value);	
+	CFormat& operator%(unsigned long long value);
 	CFormat& operator%(double value);
-	CFormat& operator%(const wxChar* value);
+	CFormat& operator%(const wxChar* value)		{ return *this % wxString(value); }
 	CFormat& operator%(const wxString& value);
-	CFormat& operator%(const CPrintable& value);	
-	CFormat& operator%(void * value);	
+	CFormat& operator%(const CPrintable& value)	{ return *this % value.GetPrintableString(); }
+	CFormat& operator%(void * value);
 	// \}
 
 
@@ -188,55 +180,6 @@ private:
 };
 
 
-
-////////////////////////////////////////////////////////////////////////////////
-
-inline CFormat& CFormat::operator%(signed short value)
-{
-	return *this % (signed long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(unsigned short value)
-{
-	return *this % (unsigned long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(signed int value)
-{
-	return *this % (signed long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(unsigned int value)
-{
-	return *this % (unsigned long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(signed long value)
-{
-	return *this % (signed long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(unsigned long value)
-{
-	return *this % (unsigned long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(const wxChar* val)
-{
-	return *this % wxString(val);
-}
-
-inline CFormat& CFormat::operator%(const CPrintable& value)
-{
-	return *this % value.GetPrintableString();
-}
-
 #if wxCHECK_VERSION(2, 9, 0)
 #define WXLONGLONGFMTSPEC wxT(wxLongLongFmtSpec)
 #else
-- 
2.11.4.GIT