Ticket #2015: format.patch

boost/format/format_class.hpp

@@ -68 +68 @@
             { return io::detail::feed<CharT, Tr, Alloc, T&>(*this,x); }
 #endif
 
+#ifdef __GNUC__
+        // GCC can't handle anonymous enums without some help
+        // ** arguments passing ** //
+        basic_format&   operator%(const int& x)
+            { return io::detail::feed<CharT, Tr, Alloc, const int&>(*this,x); }
+
+#ifndef BOOST_NO_OVERLOAD_FOR_NON_CONST
+        basic_format&   operator%(int& x) 
+            { return io::detail::feed<CharT, Tr, Alloc, int&>(*this,x); }
+#endif
+#endif
+
         // ** object modifying **//
         template<class T>
         basic_format&  bind_arg(int argN, const T& val) 

libs/format/test/format_test_enum.cpp

@@ +1 @@
+// ------------------------------------------------------------------------------
+//  format_test_enum.cpp :  test format use with enums
+// ------------------------------------------------------------------------------
+
+//  Copyright Steven Watanabe 2009.
+//
+//  Distributed under the Boost Software License, Version 1.0. (See
+//  accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/format for library home page
+
+// ------------------------------------------------------------------------------
+
+#include "boost/format.hpp"
+
+#define BOOST_INCLUDE_MAIN 
+#include <boost/test/test_tools.hpp>
+
+enum enum_plain { PLAIN };
+enum { ANONYMOUS };
+enum enum_overloaded { OVERLOADED };
+typedef enum { OVERLOADED_TYPEDEF } enum_overloaded_typedef;
+
+std::ostream& operator<<(std::ostream& os, enum_overloaded) {
+    os << "overloaded";
+    return(os);
+}
+
+std::ostream& operator<<(std::ostream& os, enum_overloaded_typedef) {
+    os << "overloaded";
+    return(os);
+}
+
+int test_main(int, char*[]) {
+    // in this case, we should implicitly convert to int
+    BOOST_CHECK_EQUAL((boost::format("%d") % PLAIN).str(), "0");
+    BOOST_CHECK_EQUAL((boost::format("%d") % ANONYMOUS).str(), "0");
+
+    // but here we need to use the overloaded operator
+    BOOST_CHECK_EQUAL((boost::format("%s") % OVERLOADED).str(), "overloaded");
+    BOOST_CHECK_EQUAL((boost::format("%s") % OVERLOADED_TYPEDEF).str(), "overloaded");
+
+    return 0;
+}

libs/format/test/Jamfile.v2

@@ -18 +18 @@
         [ run format_test2.cpp ]
         [ run format_test3.cpp ]
         [ run format_test_wstring.cpp ]
+        [ run format_test_enum.cpp ]
   ;
 }