[Libreoffice-commits] core.git: 3 commits - download.lst external/boost svx/source
Caolán McNamara
caolanm at redhat.com
Tue Jan 7 07:59:46 PST 2014
download.lst | 2
external/boost/UnpackedTarball_boost.mk | 4
external/boost/boost.9397.warnings.patch.0 | 91 ++++
external/boost/boost.endian.patch | 24 -
external/boost/boost.std.move.patch | 6
external/boost/boost.wshadow.patch | 32 -
external/boost/boost.wundef.patch | 42 --
external/boost/boost.wunused-local-typedefs.patch | 258 ++++++++++++
external/boost/boost.wunused.patch | 30 -
external/boost/boost_1_44_0-clang-warnings.patch | 11
external/boost/boost_1_44_0-gcc4.8.patch | 448 ----------------------
svx/source/accessibility/charmapacc.cxx | 13
12 files changed, 386 insertions(+), 575 deletions(-)
New commits:
commit 85ecb74a6ace6b53e065e23df3ac502d136d1cd9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 7 15:32:49 2014 +0000
reduce warnings patches
Change-Id: I7a861758236bbae7f82292123ff012de97e2f4de
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 966d33a..d73ee50 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -34,7 +34,7 @@ endif
# Clang warnings:
boost_patches += boost_1_44_0-clang-warnings.patch
-boost_patches += boost_1_44_0-gcc4.8.patch
+boost_patches += boost.wunused-local-typedefs.patch
boost_patches += boost.auto_link.patch
boost_patches += boost.endian.patch
diff --git a/external/boost/boost_1_44_0-gcc4.8.patch b/external/boost/boost.wunused-local-typedefs.patch
similarity index 68%
rename from external/boost/boost_1_44_0-gcc4.8.patch
rename to external/boost/boost.wunused-local-typedefs.patch
index 695f8ac..ced3195 100644
--- a/external/boost/boost_1_44_0-gcc4.8.patch
+++ b/external/boost/boost.wunused-local-typedefs.patch
@@ -256,120 +256,3 @@
typedef typename ScannerT::iterator_t iterator_t;
iterator_t const s(scan.first);
---- misc/boost_1_44_0/boost/date_time/time_facet.hpp
-+++ misc/build/boost_1_44_0/boost/date_time/time_facet.hpp
-@@ -439,31 +439,31 @@
- time_dur_arg.get_rep().as_special());
- }
-
-- string_type format(m_time_duration_format);
-+ string_type lcl_format(m_time_duration_format);
- if (time_dur_arg.is_negative()) {
- // replace %- with minus sign. Should we use the numpunct facet?
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- duration_sign_negative_only,
- negative_sign);
- // remove all the %+ in the string with '-'
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- duration_sign_always,
- negative_sign);
- }
- else { //duration is positive
- // remove all the %- combos from the string
-- boost::algorithm::erase_all(format, duration_sign_negative_only);
-+ boost::algorithm::erase_all(lcl_format, duration_sign_negative_only);
- // remove all the %+ in the string with '+'
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- duration_sign_always,
- positive_sign);
- }
-
- // %T and %R have to be replaced here since they are not standard
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- boost::as_literal(formats_type::full_24_hour_time_format),
- boost::as_literal(formats_type::full_24_hour_time_expanded_format));
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- boost::as_literal(formats_type::short_24_hour_time_format),
- boost::as_literal(formats_type::short_24_hour_time_expanded_format));
-
-@@ -476,22 +476,22 @@
- * here ourself.
- */
- string_type hours_str;
-- if (format.find(unrestricted_hours_format) != string_type::npos) {
-+ if (lcl_format.find(unrestricted_hours_format) != string_type::npos) {
- hours_str = hours_as_string(time_dur_arg);
-- boost::algorithm::replace_all(format, unrestricted_hours_format, hours_str);
-+ boost::algorithm::replace_all(lcl_format, unrestricted_hours_format, hours_str);
- }
- // We still have to process restricted hours format specifier. In order to
- // support parseability of durations in ISO format (%H%M%S), we'll have to
- // restrict the stringified hours length to 2 characters.
-- if (format.find(hours_format) != string_type::npos) {
-+ if (lcl_format.find(hours_format) != string_type::npos) {
- if (hours_str.empty())
- hours_str = hours_as_string(time_dur_arg);
- BOOST_ASSERT(hours_str.length() <= 2);
-- boost::algorithm::replace_all(format, hours_format, hours_str);
-+ boost::algorithm::replace_all(lcl_format, hours_format, hours_str);
- }
-
- string_type frac_str;
-- if (format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
-+ if (lcl_format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
- // replace %s with %S.nnn
- frac_str =
- fractional_seconds_as_string(time_dur_arg, false);
-@@ -500,21 +500,21 @@
- string_type replace_string(seconds_format);
- replace_string += sep;
- replace_string += frac_str;
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- seconds_with_fractional_seconds_format,
- replace_string);
- }
-- if (format.find(fractional_seconds_format) != string_type::npos) {
-+ if (lcl_format.find(fractional_seconds_format) != string_type::npos) {
- // replace %f with nnnnnnn
- if (!frac_str.size()) {
- frac_str = fractional_seconds_as_string(time_dur_arg, false);
- }
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- fractional_seconds_format,
- frac_str);
- }
-
-- if (format.find(fractional_seconds_or_none_format) != string_type::npos) {
-+ if (lcl_format.find(fractional_seconds_or_none_format) != string_type::npos) {
- // replace %F with nnnnnnn or nothing if fs == 0
- frac_str =
- fractional_seconds_as_string(time_dur_arg, true);
-@@ -523,18 +523,18 @@
- string_type replace_string;
- replace_string += sep;
- replace_string += frac_str;
-- boost::algorithm::replace_all(format,
-+ boost::algorithm::replace_all(lcl_format,
- fractional_seconds_or_none_format,
- replace_string);
- }
- else {
-- boost::algorithm::erase_all(format,
-+ boost::algorithm::erase_all(lcl_format,
- fractional_seconds_or_none_format);
- }
- }
-
- return this->do_put_tm(next_arg, ios_arg, fill_arg,
-- to_tm(time_dur_arg), format);
-+ to_tm(time_dur_arg), lcl_format);
- }
-
- OutItrT put(OutItrT next, std::ios_base& ios_arg,
commit 350fa6154cada01aac8170be0f3cf2dbb690eca4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 7 09:47:08 2014 +0000
bump boost from 1.54 to 1.55
Change-Id: I5c9d01fa1be54b81f2aedead5f55ae737fb25d5a
diff --git a/download.lst b/download.lst
index 5cd4914..e8ccd54 100644
--- a/download.lst
+++ b/download.lst
@@ -31,7 +31,7 @@ export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-
export APACHE_COMMONS_HTTPCLIENT_TARBALL := 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
export APACHE_COMMONS_LANG_TARBALL := 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
export APACHE_COMMONS_LOGGING_TARBALL := 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-export BOOST_TARBALL := 15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
+export BOOST_TARBALL := d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 777a8c4..966d33a 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -47,6 +47,8 @@ boost_patches += boost.wshadow.patch
boost_patches += boost.wdeprecated-register.patch.0
boost_patches += boost.wuninitialized.patch
boost_patches += boost.wdeprecated-auto_ptr.patch.0
+#https://svn.boost.org/trac/boost/ticket/9397
+boost_patches += boost.9397.warnings.patch.0
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/external/boost/boost.9397.warnings.patch.0 b/external/boost/boost.9397.warnings.patch.0
new file mode 100644
index 0000000..429d707
--- /dev/null
+++ b/external/boost/boost.9397.warnings.patch.0
@@ -0,0 +1,91 @@
+Index: boost/predef/os/bsd/bsdi.h
+===================================================================
+--- boost/predef/os/bsd/bsdi.h (revision 86709)
++++ boost/predef/os/bsd/bsdi.h (working copy)
+@@ -24,7 +24,7 @@
+
+ #define BOOST_OS_BSD_BSDI BOOST_VERSION_NUMBER_NOT_AVAILABLE
+
+-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
+ defined(__bsdi__) \
+ )
+ # ifndef BOOST_OS_BSD_AVAILABLE
+Index: boost/predef/os/bsd/dragonfly.h
+===================================================================
+--- boost/predef/os/bsd/dragonfly.h (revision 86709)
++++ boost/predef/os/bsd/dragonfly.h (working copy)
+@@ -24,7 +24,7 @@
+
+ #define BOOST_OS_BSD_DRAGONFLY BOOST_VERSION_NUMBER_NOT_AVAILABLE
+
+-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
+ defined(__DragonFly__) \
+ )
+ # ifndef BOOST_OS_BSD_AVAILABLE
+Index: boost/predef/os/bsd/free.h
+===================================================================
+--- boost/predef/os/bsd/free.h (revision 86709)
++++ boost/predef/os/bsd/free.h (working copy)
+@@ -26,7 +26,7 @@
+
+ #define BOOST_OS_BSD_FREE BOOST_VERSION_NUMBER_NOT_AVAILABLE
+
+-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
+ defined(__FreeBSD__) \
+ )
+ # ifndef BOOST_OS_BSD_AVAILABLE
+Index: boost/predef/os/bsd/net.h
+===================================================================
+--- boost/predef/os/bsd/net.h (revision 86709)
++++ boost/predef/os/bsd/net.h (working copy)
+@@ -31,7 +31,7 @@
+
+ #define BOOST_OS_BSD_NET BOOST_VERSION_NUMBER_NOT_AVAILABLE
+
+-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
+ defined(__NETBSD__) || defined(__NetBSD__) \
+ )
+ # ifndef BOOST_OS_BSD_AVAILABLE
+Index: boost/predef/os/bsd/open.h
+===================================================================
+--- boost/predef/os/bsd/open.h (revision 86709)
++++ boost/predef/os/bsd/open.h (working copy)
+@@ -55,7 +55,7 @@
+
+ #define BOOST_OS_BSD_OPEN BOOST_VERSION_NUMBER_NOT_AVAILABLE
+
+-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
+ defined(__OpenBSD__) \
+ )
+ # ifndef BOOST_OS_BSD_AVAILABLE
+Index: boost/predef/os/bsd.h
+===================================================================
+--- boost/predef/os/bsd.h (revision 86709)
++++ boost/predef/os/bsd.h (working copy)
+@@ -59,7 +59,7 @@
+ #define BOOST_OS_BSD BOOST_VERSION_NUMBER_NOT_AVAILABLE
+ #endif
+
+-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
+ defined(BSD) || \
+ defined(_SYSTYPE_BSD) \
+ )
+Index: boost/predef/os/macos.h
+===================================================================
+--- boost/predef/os/macos.h (revision 86709)
++++ boost/predef/os/macos.h (working copy)
+@@ -31,7 +31,7 @@
+
+ #define BOOST_OS_MACOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
+
+-#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
++#if !defined(BOOST_PREDEF_DETAIL_OS_DETECTED) && ( \
+ defined(macintosh) || defined(Macintosh) || \
+ (defined(__APPLE__) && defined(__MACH__)) \
+ )
diff --git a/external/boost/boost.endian.patch b/external/boost/boost.endian.patch
index 14505e0b..0982090 100644
--- a/external/boost/boost.endian.patch
+++ b/external/boost/boost.endian.patch
@@ -1,13 +1,11 @@
---- foo/foo/foo/boost/detail/endian.hpp
-+++ foo/foo/foo/boost/detail/endian.hpp
-@@ -28,8 +28,8 @@
- //
- // Special cases come first:
- //
--#if defined (__GLIBC__)
--// GNU libc offers the helpful header <endian.h> which defines
-+#if defined (__GLIBC__) || defined(__ANDROID__)
-+// GNU libc and Android's bionic offer the helpful header <endian.h> which defines
- // __BYTE_ORDER
- # include <endian.h>
- # if (__BYTE_ORDER == __LITTLE_ENDIAN)
+--- foo/foo/foo/boost/predef/other/endian.h
++++ foo/foo/foo/boost/predef/other/endian.h
+@@ -53,7 +53,7 @@
+ */
+ #if !BOOST_ENDIAN_BIG_BYTE && !BOOST_ENDIAN_BIG_WORD && \
+ !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD
+-# if BOOST_LIB_C_GNU
++# if BOOST_LIB_C_GNU || defined(__ANDROID__)
+ # include <endian.h>
+ # else
+ # if BOOST_OS_MACOS
diff --git a/external/boost/boost.std.move.patch b/external/boost/boost.std.move.patch
index 83badae..c6cc329 100644
--- a/external/boost/boost.std.move.patch
+++ b/external/boost/boost.std.move.patch
@@ -1,15 +1,15 @@
--- foo/foo/foo/boost/config/compiler/clang.hpp
+++ foo/foo/foo/boost/config/compiler/clang.hpp
-@@ -8,6 +8,8 @@
+@@ -10,6 +10,8 @@
- // Clang compiler setup.
+ #define BOOST_HAS_PRAGMA_ONCE
+#include <utility>
+
#if !__has_feature(cxx_exceptions) && !defined(BOOST_NO_EXCEPTIONS)
# define BOOST_NO_EXCEPTIONS
#endif
-@@ -108,7 +108,7 @@
+@@ -128,7 +130,7 @@
# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#endif
diff --git a/external/boost/boost.wshadow.patch b/external/boost/boost.wshadow.patch
index d27feac..85e4cd3 100644
--- a/external/boost/boost.wshadow.patch
+++ b/external/boost/boost.wshadow.patch
@@ -1,35 +1,3 @@
---- foo/foo/foo/boost/math/special_functions/detail/bessel_jy_series.hpp
-+++ foo/foo/foo/boost/math/special_functions/detail/bessel_jy_series.hpp
-@@ -194,9 +194,9 @@
- }
- else
- {
-- int s;
-- prefix = boost::math::lgamma(-v, &s, pol) + p;
-- prefix = exp(prefix) * s / constants::pi<T>();
-+ int s_lcl;
-+ prefix = boost::math::lgamma(-v, &s_lcl, pol) + p;
-+ prefix = exp(prefix) * s_lcl / constants::pi<T>();
- }
- bessel_y_small_z_series_term_b<T, Policy> s2(v, x);
- max_iter = policies::get_max_series_iterations<Policy>();
---- foo/foo/foo/boost/math/special_functions/ellint_rj.hpp
-+++ foo/foo/foo/boost/math/special_functions/ellint_rj.hpp
-@@ -91,11 +91,11 @@
-
- BOOST_ASSERT(pmy >= 0);
-
-- T p = pmy + y;
-- value = boost::math::ellint_rj(x, y, z, p, pol);
-+ T p_lcl = pmy + y;
-+ value = boost::math::ellint_rj(x, y, z, p_lcl, pol);
- value *= pmy;
- value -= 3 * boost::math::ellint_rf(x, y, z, pol);
-- value += 3 * sqrt((x * y * z) / (x * z + p * q)) * boost::math::ellint_rc(x * z + p * q, p * q, pol);
-+ value += 3 * sqrt((x * y * z) / (x * z + p_lcl * q)) * boost::math::ellint_rc(x * z + p_lcl * q, p_lcl * q, pol);
- value /= (y + q);
- return value;
- }
--- foo/foo/foo/boost/random/binomial_distribution.hpp
+++ foo/foo/foo/boost/random/binomial_distribution.hpp
@@ -272,21 +272,21 @@
diff --git a/external/boost/boost.wundef.patch b/external/boost/boost.wundef.patch
index d453814..522a291 100644
--- a/external/boost/boost.wundef.patch
+++ b/external/boost/boost.wundef.patch
@@ -1,34 +1,14 @@
---- foo/foo/foo/boost/detail/endian.hpp
-+++ foo/foo/foo/boost/detail/endian.hpp
-@@ -47,15 +47,15 @@
- # define BOOST_LITTLE_ENDIAN
- # elif (__BYTE_ORDER == __BIG_ENDIAN)
- # define BOOST_BIG_ENDIAN
--# elif (__BYTE_ORDER == __PDP_ENDIAN)
-+# elif defined(__PDP_ENDIAN) && (__BYTE_ORDER == __PDP_ENDIAN)
- # define BOOST_PDP_ENDIAN
- # else
- # error Unknown machine endianness detected.
- # endif
- # define BOOST_BYTE_ORDER __BYTE_ORDER
-
- #elif defined(__NetBSD__) || defined(__FreeBSD__) || \
-- defined(__OpenBSD__) || (__DragonFly__)
-+ defined(__OpenBSD__) || (defined(__DragonFly__) && (__DragonFly__))
- //
- // BSD has endian.h, see https://svn.boost.org/trac/boost/ticket/6013
- # if defined(__OpenBSD__)
---- foo/foo/foo/boost/lexical_cast.hpp
-+++ foo/foo/foo/boost/lexical_cast.hpp
-@@ -69,7 +69,7 @@
- throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)))
- #endif
-
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || (defined(GCC_VERSION) && GCC_VERSION > 40700)
- #define BOOST_LCAST_HAS_INT128
- #endif
-
+--- foo/foo/foo/boost/predef/other/endian.h
++++ foo/foo/foo/boost/predef/other/endian.h
+@@ -77,7 +77,7 @@
+ # undef BOOST_ENDIAN_LITTLE_BYTE
+ # define BOOST_ENDIAN_LITTLE_BYTE BOOST_VERSION_NUMBER_AVAILABLE
+ # endif
+-# if (__BYTE_ORDER == __PDP_ENDIAN)
++# if defined(__PDP_ENDIAN) && (__BYTE_ORDER == __PDP_ENDIAN)
+ # undef BOOST_ENDIAN_LITTLE_WORD
+ # define BOOST_ENDIAN_LITTLE_WORD BOOST_VERSION_NUMBER_AVAILABLE
+ # endif
--- foo/foo/foo/boost/multi_array/base.hpp
+++ foo/foo/foo/boost/multi_array/base.hpp
@@ -65,7 +65,7 @@
diff --git a/external/boost/boost.wunused.patch b/external/boost/boost.wunused.patch
index ddffa04..8a7cab4 100644
--- a/external/boost/boost.wunused.patch
+++ b/external/boost/boost.wunused.patch
@@ -1,33 +1,3 @@
---- foo/foo/foo/boost/math/special_functions/airy.hpp
-+++ foo/foo/foo/boost/math/special_functions/airy.hpp
-@@ -340,13 +340,6 @@
- inline T airy_ai_zero(unsigned m, const Policy& pol)
- {
- BOOST_FPU_EXCEPTION_GUARD
-- typedef typename policies::evaluation<T, Policy>::type value_type;
-- typedef typename policies::normalise<
-- Policy,
-- policies::promote_float<false>,
-- policies::promote_double<false>,
-- policies::discrete_quantile<>,
-- policies::assert_undefined<> >::type forwarding_policy;
- BOOST_STATIC_ASSERT_MSG(false == std::numeric_limits<T>::is_integer, "Airy return type must be a floating-point type.");
- return policies::checked_narrowing_cast<T, Policy>(detail::airy_ai_zero_imp<T>(m, pol), "boost::math::airy_ai_zero<%1%>(unsigned)");
- }
-@@ -388,13 +381,6 @@
- inline T airy_bi_zero(unsigned m, const Policy& pol)
- {
- BOOST_FPU_EXCEPTION_GUARD
-- typedef typename policies::evaluation<T, Policy>::type value_type;
-- typedef typename policies::normalise<
-- Policy,
-- policies::promote_float<false>,
-- policies::promote_double<false>,
-- policies::discrete_quantile<>,
-- policies::assert_undefined<> >::type forwarding_policy;
- BOOST_STATIC_ASSERT_MSG(false == std::numeric_limits<T>::is_integer, "Airy return type must be a floating-point type.");
- return policies::checked_narrowing_cast<T, Policy>(detail::airy_bi_zero_imp<T>(m, pol), "boost::math::airy_bi_zero<%1%>(unsigned)");
- }
--- foo/foo/foo/boost/multi_array/base.hpp
+++ foo/foo/foo/boost/multi_array/base.hpp
@@ -501,6 +501,7 @@
diff --git a/external/boost/boost_1_44_0-clang-warnings.patch b/external/boost/boost_1_44_0-clang-warnings.patch
index 177df02..d5b934b 100644
--- a/external/boost/boost_1_44_0-clang-warnings.patch
+++ b/external/boost/boost_1_44_0-clang-warnings.patch
@@ -1,14 +1,3 @@
---- misc/boost_1_44_0/boost/math/tools/fraction.hpp
-+++ misc/build/boost_1_44_0/boost/math/tools/fraction.hpp
-@@ -33,7 +33,7 @@
- typedef typename Gen::result_type result_type;
- typedef typename Gen::result_type value_type;
-
-- static result_type a(const value_type& v)
-+ static result_type a(const value_type&)
- {
- return 1;
- }
--- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
+++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp
@@ -16,6 +16,12 @@
diff --git a/external/boost/boost_1_44_0-gcc4.8.patch b/external/boost/boost_1_44_0-gcc4.8.patch
index 700e2ff..695f8ac 100644
--- a/external/boost/boost_1_44_0-gcc4.8.patch
+++ b/external/boost/boost_1_44_0-gcc4.8.patch
@@ -1,23 +1,3 @@
-
-
---- a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:12:02.036007347 +0200
-+++ a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:11:56.260996218 +0200
-@@ -1331,7 +1331,6 @@
- BOOST_FPU_EXCEPTION_GUARD
- typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
- typedef typename policies::evaluation<result_type, Policy>::type value_type;
-- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
-@@ -1349,7 +1348,6 @@
- BOOST_FPU_EXCEPTION_GUARD
- typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
- typedef typename policies::evaluation<result_type, Policy>::type value_type;
-- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
- typedef typename policies::normalise<
- Policy,
- policies::promote_float<false>,
--- a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:09.804149686 +0200
+++ a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:30.020195845 +0200
@@ -55,7 +55,6 @@
@@ -82,17 +62,6 @@
d = from_stream(beg, eos);
return is;
}
---- a/b/boost/boost/unordered/detail/unique.hpp 2013-05-31 13:32:51.122254361 +0200
-+++ a/b/boost/boost/unordered/detail/unique.hpp 2013-05-31 13:32:57.578278121 +0200
-@@ -334,8 +334,6 @@
-
- value_type& operator[](key_type const& k)
- {
-- typedef typename value_type::second_type mapped_type;
--
- std::size_t key_hash = this->hash(k);
- iterator pos = this->find_node(key_hash, k);
-
--- a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:31:21.682966336 +0200
+++ a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:32:44.067231648 +0200
@@ -225,7 +225,6 @@
@@ -103,48 +72,6 @@
return impl::call(c).head;
}
---- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
-+++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
-@@ -142,7 +142,6 @@
- ForwardIteratorT End,
- std::forward_iterator_tag ) const
- {
-- typedef ForwardIteratorT input_iterator_type;
- typedef iterator_range<ForwardIteratorT> result_type;
-
- first_finder_type first_finder(
-@@ -263,7 +262,6 @@
- ForwardIteratorT End,
- unsigned int N) const
- {
-- typedef ForwardIteratorT input_iterator_type;
- typedef iterator_range<ForwardIteratorT> result_type;
-
- // Sanity check
-@@ -298,7 +296,6 @@
- ForwardIteratorT End,
- unsigned int N) const
- {
-- typedef ForwardIteratorT input_iterator_type;
- typedef iterator_range<ForwardIteratorT> result_type;
-
- // Sanity check
-@@ -362,7 +359,6 @@
- unsigned int N,
- std::random_access_iterator_tag )
- {
-- typedef ForwardIteratorT input_iterator_type;
- typedef iterator_range<ForwardIteratorT> result_type;
-
- if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
-@@ -436,7 +432,6 @@
- unsigned int N,
- std::random_access_iterator_tag )
- {
-- typedef ForwardIteratorT input_iterator_type;
- typedef iterator_range<ForwardIteratorT> result_type;
-
- if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
--- misc/boost_1_44_0/boost/bind/arg.hpp
+++ misc/build/boost_1_44_0/boost/bind/arg.hpp
@@ -35,6 +35,8 @@
commit 8fad6d99650c63dcc4a4ca4910d34dc4b901c00d
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Jan 7 08:45:56 2014 +0000
Resolves: #i123986# fix charmap accessibility for...
code points beyond the unicode baseplane
(cherry picked from commit 5a81299b05da6f1f9ec81246abe54c55f49793a4)
Conflicts:
svx/source/accessibility/charmapacc.cxx
Change-Id: I29eaf14211be633a8dd354aac9f308e4a18ba27b
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 28a11fe..36f493f 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -696,18 +696,21 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription()
ensureAlive();
OUString sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE );
- sal_Unicode c = mpParent->maText[0];
+ const OUString aCharStr( mpParent->maText);
+ sal_Int32 nStrIndex = 0;
+ const sal_UCS4 c = aCharStr.iterateCodePoints( &nStrIndex );
+ const int tmp_len = (c < 0x10000) ? 4 : 6;
char buf[16] = "0x0000";
- sal_Unicode c_Shifted = c;
- for( int i = 0; i < 4; ++i )
+ sal_UCS4 c_Shifted = c;
+ for( int i = 0; i < tmp_len; ++i )
{
char h = (char)(c_Shifted & 0x0F);
- buf[5-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
+ buf[tmp_len+1-i] = (h > 9) ? (h - 10 + 'A') : (h + '0');
c_Shifted >>= 4;
}
if( c < 256 )
snprintf( buf+6, 10, " (%d)", c );
- sDescription += OUString(buf, strlen(buf), RTL_TEXTENCODING_ASCII_US);
+ sDescription += " " + OUString(buf, strlen(buf), RTL_TEXTENCODING_ASCII_US);
return sDescription;
}
More information about the Libreoffice-commits
mailing list