From f4f3058b8cd75c04080f9b68cb54b9584eafb39f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 14 May 2012 21:36:42 -0600
Subject: Switch to using Boost.Format

---
 src/system.hh.in | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/system.hh.in')

diff --git a/src/system.hh.in b/src/system.hh.in
index 552a591a..8b8fef7f 100644
--- a/src/system.hh.in
+++ b/src/system.hh.in
@@ -117,12 +117,6 @@ typedef std::ostream::pos_type ostream_pos_type;
 #include <sys/types.h>
 #include <sys/wait.h>
 #endif
-#if defined(HAVE_GETTEXT)
-#include "gettext.h"
-#define _(str) gettext(str)
-#else
-#define _(str) str
-#endif
 
 #include <gmp.h>
 #include <mpfr.h>
@@ -152,6 +146,8 @@ typedef std::ostream::pos_type ostream_pos_type;
 #if !(defined(__GXX_EXPERIMENTAL_CXX0X__) && __GXX_EXPERIMENTAL_CXX0X__)
 #include <boost/foreach.hpp>
 #endif
+
+#include <boost/format.hpp>
 #include <boost/function.hpp>
 
 #include <boost/graph/adjacency_list.hpp>
@@ -193,6 +189,15 @@ typedef std::ostream::pos_type ostream_pos_type;
 #include <boost/variant.hpp>
 #include <boost/version.hpp>
 
+#if defined(HAVE_GETTEXT)
+#include "gettext.h"
+#define _(str) gettext(str)
+#define _f(str) boost::format(gettext(str))
+#else
+#define _(str) str
+#define _f(str) boost::format(str)
+#endif
+
 #if defined(HAVE_BOOST_SERIALIZATION)
 
 #include <boost/archive/binary_iarchive.hpp>
-- 
cgit v1.2.3