From 61102f102854c16475f120e4d2604fa3dd1d1663 Mon Sep 17 00:00:00 2001
From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Wed, 13 Sep 2006 11:18:13 +0000
Subject: [PATCH] Compile fix for the case when USE_BOOST_FORMAT is 0 	*
 src/support/lstrings.C 	(bformat): Add missing lyx::from_ascii()

	* src/support/convert.C
	(docstring convert<docstring>(unsigned int)): Add specialization
	(docstring convert<docstring>(long)): ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14983 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/support/convert.C  | 16 ++++++++++++++++
 src/support/lstrings.C |  7 +++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/support/convert.C b/src/support/convert.C
index 698365e4a7..bd8dc2ec17 100644
--- a/src/support/convert.C
+++ b/src/support/convert.C
@@ -53,12 +53,14 @@ string convert<string>(int i)
 	return lexical_cast<string>(i);
 }
 
+
 template<>
 docstring convert<docstring>(int i)
 {
 	return lyx::from_ascii(lexical_cast<string>(i));
 }
 
+
 template<>
 string convert<string>(unsigned int ui)
 {
@@ -66,6 +68,13 @@ string convert<string>(unsigned int ui)
 }
 
 
+template<>
+docstring convert<docstring>(unsigned int ui)
+{
+	return lyx::from_ascii(lexical_cast<string>(ui));
+}
+
+
 template<>
 string convert<string>(unsigned long ul)
 {
@@ -80,6 +89,13 @@ string convert<string>(long l)
 }
 
 
+template<>
+docstring convert<docstring>(long l)
+{
+	return lyx::from_ascii(lexical_cast<string>(l));
+}
+
+
 template<>
 string convert<string>(float f)
 {
diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index f9fc6cbd00..a142dae8fb 100644
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -705,6 +705,7 @@ docstring bformat<docstring>(docstring const & fmt, docstring arg1)
 }
 
 
+template<>
 docstring bformat(docstring const & fmt, char * arg1)
 {
 	return (boost::basic_format<char_type>(fmt) % arg1).str();
@@ -788,9 +789,11 @@ template<>
 docstring bformat(docstring const & fmt, char * arg1)
 {
 	BOOST_ASSERT(contains(fmt, lyx::from_ascii("%1$s")));
-	docstring const str = subst(fmt, lyx::from_ascii("%1$s"), arg1);
+	docstring const str = subst(fmt, lyx::from_ascii("%1$s"), lyx::from_ascii(arg1));
 	return subst(str, lyx::from_ascii("%%"), lyx::from_ascii("%"));
 }
+
+
 template<>
 docstring bformat(docstring const & fmt, docstring arg1, docstring arg2)
 {
@@ -807,7 +810,7 @@ docstring bformat(docstring const & fmt, char const * arg1, docstring arg2)
 {
 	BOOST_ASSERT(contains(fmt, lyx::from_ascii("%1$s")));
 	BOOST_ASSERT(contains(fmt, lyx::from_ascii("%2$s")));
-	docstring str = subst(fmt, lyx::from_ascii("%1$s"), arg1);
+	docstring str = subst(fmt, lyx::from_ascii("%1$s"), lyx::from_ascii(arg1));
 	str = subst(fmt, lyx::from_ascii("%2$s"), arg2);
 	return subst(str, lyx::from_ascii("%%"), lyx::from_ascii("%"));
 }
-- 
2.39.2