diff --git a/Formula/boost.rb b/Formula/boost.rb index b936f4d5e7f..b8377353cb6 100644 --- a/Formula/boost.rb +++ b/Formula/boost.rb @@ -2,15 +2,14 @@ require 'formula' class Boost < Formula homepage 'http://www.boost.org' - url 'http://downloads.sourceforge.net/project/boost/boost/1.48.0/boost_1_48_0.tar.bz2' - md5 'd1e9a7a7f532bb031a3c175d86688d95' + url 'http://downloads.sourceforge.net/project/boost/boost/1.49.0/boost_1_49_0.tar.bz2' + md5 '0d202cb811f934282dea64856a175698' head 'http://svn.boost.org/svn/boost/trunk', :using => :svn bottle do - # Bottle built on 10.7.2 using XCode 4.2 - url 'https://downloads.sourceforge.net/project/machomebrew/Bottles/boost-1.48.0-bottle.tar.gz' - sha1 'c7871ddd020a24e3b0cfd3c9a352a1210b68b372' + url 'https://downloads.sf.net/project/machomebrew/Bottles/boost-1.49.0-bottle.tar.gz' + sha1 '6b706780670a8bec5b3e0355f5dfeeaa37d9a41e' end depends_on "icu4c" if ARGV.include? "--with-icu" @@ -28,18 +27,6 @@ class Boost < Formula ] end - def patches - # https://svn.boost.org/trac/boost/ticket/6131 - # - # #define foreach BOOST_FOREACH causes weird compile error in certain - # circumstances with boost 1.48 - # - # #define foreach BOOST_FOREACH causes compile error "'boost::BOOST_FOREACH' - # has not been declared" on its line if it appears after #include - # and before certain other boost headers. - DATA unless ARGV.build_head? - end - def install if ARGV.build_universal? and not ARGV.include? "--without-python" archs = archs_for_command("python") @@ -99,63 +86,3 @@ class Boost < Formula end __END__ -Index: /boost/foreach_fwd.hpp -=================================================================== ---- /boost/foreach_fwd.hpp (revision 62661) -+++ /boost/foreach_fwd.hpp (revision 75540) -@@ -15,4 +15,6 @@ - #define BOOST_FOREACH_FWD_HPP - -+#include // for std::pair -+ - // This must be at global scope, hence the uglified name - enum boost_foreach_argument_dependent_lookup_hack -@@ -26,4 +28,7 @@ - namespace foreach - { -+ template -+ std::pair in_range(T begin, T end); -+ - /////////////////////////////////////////////////////////////////////////////// - // boost::foreach::tag -@@ -47,4 +52,22 @@ - } // namespace foreach - -+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131 -+namespace BOOST_FOREACH -+{ -+ using foreach::in_range; -+ using foreach::tag; -+ -+ template -+ struct is_lightweight_proxy -+ : foreach::is_lightweight_proxy -+ {}; -+ -+ template -+ struct is_noncopyable -+ : foreach::is_noncopyable -+ {}; -+ -+} // namespace BOOST_FOREACH -+ - } // namespace boost - -Index: /boost/foreach.hpp -=================================================================== ---- /boost/foreach.hpp (revision 75077) -+++ /boost/foreach.hpp (revision 75540) -@@ -166,5 +166,5 @@ - // at the global namespace for your type. - template --inline boost::foreach::is_lightweight_proxy * -+inline boost::BOOST_FOREACH::is_lightweight_proxy * - boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } - -@@ -191,5 +191,5 @@ - // at the global namespace for your type. - template --inline boost::foreach::is_noncopyable * -+inline boost::BOOST_FOREACH::is_noncopyable * - boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } -