Author: pfg Date: Sun Jan 6 23:00:03 2013 New Revision: 1429608 URL: http://svn.apache.org/viewvc?rev=1429608&view=rev Log: Fix issue in Boost 1.48:
Code will not compile if macro BOOST_LCAST_NO_WCHAR_T is defined https://svn.boost.org/trac/boost/ticket/6400 The commit was committed upstream. Modified: openoffice/trunk/main/boost/boost_freebsd.patch Modified: openoffice/trunk/main/boost/boost_freebsd.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/main/boost/boost_freebsd.patch?rev=1429608&r1=1429607&r2=1429608&view=diff ============================================================================== --- openoffice/trunk/main/boost/boost_freebsd.patch (original) +++ openoffice/trunk/main/boost/boost_freebsd.patch Sun Jan 6 23:00:03 2013 @@ -248,7 +248,20 @@ Index: boost/archive/shared_ptr_helper.h typedef int ioctl_arg_type; typedef uint32_t u_long_type; typedef uint16_t u_short_type; ---- misc/boost_1_48_0/boost/pool/pool.hpp.orig 2011-12-15 18:21:40.000000000 +0300 +--- misc/boost_1_48_0/boost/lexical_cast.hpp.orig 2013-01-06 17:10:22.000000000 -0500 ++++ misc/build/boost_1_48_0/boost/lexical_cast.hpp 2013-01-06 17:11:25.000000000 -0500 +@@ -648,8 +648,8 @@ + , const CharT opening_brace, const CharT closing_brace) + { + using namespace std; +- const wchar_t minus = lcast_char_constants<wchar_t>::minus; +- const wchar_t plus = lcast_char_constants<wchar_t>::plus; ++ const CharT minus = lcast_char_constants<CharT>::minus; ++ const CharT plus = lcast_char_constants<CharT>::plus; + const int inifinity_size = 8; + + bool has_minus = false; + --- misc/boost_1_48_0/boost/pool/pool.hpp.orig 2011-12-15 18:21:40.000000000 +0300 +++ misc/build/boost_1_48_0/boost/pool/pool.hpp 2011-12-15 18:22:05.000000000 +0300 @@ -346,7 +346,7 @@ // For alignment reasons, this used to be defined to be lcm(requested_size, sizeof(void *), sizeof(size_type)),
