The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / boost / 0001-fix-ambiguous-format-call-on-64bit-builds.patch
1 boost: fix ambiguous format call on 64-bit builds
2
3 Fixes problem:
4
5 libs/locale/src/icu/formatter.cpp: In member function
6 'virtual std::basic_string<_CharT, std::char_traits<_CharT>, std::allocator<_CharT> > boost::locale::impl_icu::number_format<CharType>::format(boost::int64_t, size_t&) const':
7 libs/locale/src/icu/formatter.cpp:61: error: call of overloaded 'format(boost::int64_t&, icu_49::UnicodeString&)' is ambiguous
8 /ec/include/unicode/numfmt.h:317: note: candidates are: icu_49::UnicodeString& icu_49::NumberFormat::format(double, icu_49::UnicodeString&) const
9 /ec/include/unicode/numfmt.h:330: note:                 icu_49::UnicodeString& icu_49::NumberFormat::format(int32_t, icu_49::UnicodeString&) const
10 /ec/include/unicode/numfmt.h:343: note:                 icu_49::UnicodeString& icu_49::NumberFormat::format(int64_t, icu_49::UnicodeString&) const
11
12 Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
13 Backported-from: https://svn.boost.org/trac/boost/ticket/6851
14
15
16 diff -ruN boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp boost_1_49_0/libs/locale/src/icu/formatter.cpp
17 --- boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp 2011-07-12 14:57:36.000000000 +0100
18 +++ boost_1_49_0/libs/locale/src/icu/formatter.cpp      2012-05-01 14:27:54.000000000 +0100
19 @@ -58,7 +58,7 @@
20              virtual string_type format(int64_t value,size_t &code_points) const
21              {
22                  icu::UnicodeString tmp;
23 -                icu_fmt_->format(value,tmp);
24 +                icu_fmt_->format(::int64_t(value),tmp);
25                  code_points=tmp.countChar32();
26                  return cvt_.std(tmp);
27              }