From a9bdcc33013b5e1e76571ee1104bd8c7f278e775 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 20 May 2012 15:03:22 -0500
Subject: Work around collision between Format's put & Graph

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

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

diff --git a/src/system.hh.in b/src/system.hh.in
index e81dfc00..35396c90 100644
--- a/src/system.hh.in
+++ b/src/system.hh.in
@@ -184,18 +184,10 @@ typedef std::ostream::pos_type ostream_pos_type;
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 
-#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>
-#include <boost/graph/filtered_graph.hpp>
-#include <boost/graph/dijkstra_shortest_paths.hpp>
-#include <boost/graph/graphviz.hpp>
-
-#include <boost/format.hpp>
 #include <boost/intrusive_ptr.hpp>
 
 #include <boost/iostreams/stream.hpp>
@@ -237,11 +229,10 @@ typedef std::ostream::pos_type ostream_pos_type;
 #if HAVE_GETTEXT
 #include <libintl.h>
 #define _(str) gettext(str)
-#define _f(str) boost::format(gettext(str))
 #else
 #define _(str) str
-#define _f(str) boost::format(str)
 #endif
+#define _f(str) boost::format(_(str))
 
 #if HAVE_BOOST_SERIALIZATION
 
-- 
cgit v1.2.3