[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - boost/boost_1_48_0.patch boost/boost_1_55_0.patch boost/boost_freebsd.patch boost/boost-os2.patch boost/makefile.mk svx/source
Herbert Dürr
hdu at apache.org
Tue Jan 7 02:09:07 PST 2014
boost/boost-os2.patch | 22 --
boost/boost_1_48_0.patch | 323 ------------------------------
boost/boost_1_55_0.patch | 164 +++++++++++++++
boost/boost_freebsd.patch | 335 --------------------------------
boost/makefile.mk | 1
svx/source/accessibility/charmapacc.cxx | 9
6 files changed, 170 insertions(+), 684 deletions(-)
New commits:
commit 6b4710c48566b06c4b709f4a5a6019f76c8bc202
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Jan 7 10:05:01 2014 +0000
#i123817# WaE: fix the most annoying compile warnings for boost-1.55
some boost headers have the problem that parameter/variable names shadow
other class member/method names. These headers get included so often that a
full build reports almost 17000 warnings about that. This change fixes the
shadowing problem by making the local names not conflict with the class-wide
names.
diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
new file mode 100644
index 0000000..9730232
--- /dev/null
+++ b/boost/boost_1_55_0.patch
@@ -0,0 +1,164 @@
+--- misc/boost_1_55_0/boost/unordered/detail/equivalent.hpp 2012-12-05 23:06:57.000000000 +0100
++++ misc/build/boost_1_55_0/boost/unordered/detail/equivalent.hpp 2014-01-07 10:33:59.550621750 +0100
+@@ -534,11 +534,11 @@
+ }
+
+ node_pointer first_node = static_cast<node_pointer>(prev->next_);
+- link_pointer end = first_node->group_prev_->next_;
++ link_pointer end_var = first_node->group_prev_->next_;
+
+- std::size_t count = this->delete_nodes(prev, end);
++ std::size_t count_var = this->delete_nodes(prev, end_var);
+ this->fix_bucket(bucket_index, prev);
+- return count;
++ return count_var;
+ }
+
+ iterator erase(c_iterator r)
+@@ -557,21 +557,21 @@
+ return iterator(r2.node_);
+ }
+
+- link_pointer erase_nodes(node_pointer begin, node_pointer end)
++ link_pointer erase_nodes(node_pointer begin_arg, node_pointer end_arg)
+ {
+- std::size_t bucket_index = this->hash_to_bucket(begin->hash_);
++ std::size_t bucket_index = this->hash_to_bucket(begin_arg->hash_);
+
+- // Split the groups containing 'begin' and 'end'.
++ // Split the groups containing 'begin_arg' and 'end_arg'.
+ // And get the pointer to the node before begin while
+ // we're at it.
+- link_pointer prev = split_groups(begin, end);
++ link_pointer prev = split_groups(begin_arg, end_arg);
+
+- // If we don't have a 'prev' it means that begin is at the
++ // If we don't have a 'prev' it means that begin_arg is at the
+ // beginning of a block, so search through the blocks in the
+ // same bucket.
+ if (!prev) {
+ prev = this->get_previous_start(bucket_index);
+- while (prev->next_ != begin)
++ while (prev->next_ != begin_arg)
+ prev = static_cast<node_pointer>(prev->next_)->group_prev_;
+ }
+
+@@ -581,24 +581,24 @@
+ static_cast<node_pointer>(prev->next_)->group_prev_->next_;
+ this->delete_nodes(prev, group_end);
+ bucket_index = this->fix_bucket(bucket_index, prev);
+- } while(prev->next_ != end);
++ } while(prev->next_ != end_arg);
+
+ return prev;
+ }
+
+- static link_pointer split_groups(node_pointer begin, node_pointer end)
++ static link_pointer split_groups(node_pointer begin_arg, node_pointer end_arg)
+ {
+- node_pointer prev = begin->group_prev_;
+- if (prev->next_ != begin) prev = node_pointer();
++ node_pointer prev = begin_arg->group_prev_;
++ if (prev->next_ != begin_arg) prev = node_pointer();
+
+- if (end) {
+- node_pointer first = end;
+- while (first != begin && first->group_prev_->next_ == first) {
++ if (end_arg) {
++ node_pointer first = end_arg;
++ while (first != begin_arg && first->group_prev_->next_ == first) {
+ first = first->group_prev_;
+ }
+
+- boost::swap(first->group_prev_, end->group_prev_);
+- if (first == begin) return prev;
++ boost::swap(first->group_prev_, end_arg->group_prev_);
++ if (first == begin_arg) return prev;
+ }
+
+ if (prev) {
+@@ -606,7 +606,7 @@
+ while (first->group_prev_->next_ == first) {
+ first = first->group_prev_;
+ }
+- boost::swap(first->group_prev_, begin->group_prev_);
++ boost::swap(first->group_prev_, begin_arg->group_prev_);
+ }
+
+ return prev;
+--- misc/boost_1_55_0/boost/unordered/detail/table.hpp 2013-08-18 11:44:14.000000000 +0200
++++ misc/build/boost_1_55_0/boost/unordered/detail/table.hpp 2014-01-07 10:18:27.862432325 +0100
+@@ -257,9 +257,9 @@
+ return prev ? iterator(prev->next_) : iterator();
+ }
+
+- std::size_t hash_to_bucket(std::size_t hash) const
++ std::size_t hash_to_bucket(std::size_t hash_arg) const
+ {
+- return policy::to_bucket(bucket_count_, hash);
++ return policy::to_bucket(bucket_count_, hash_arg);
+ }
+
+ float load_factor() const
+@@ -655,8 +655,8 @@
+ // assign_nodes takes ownership of the container's elements,
+ // assigning to them if possible, and deleting any that are
+ // left over.
+- assign_nodes<table> assign(*this);
+- table_impl::fill_buckets(x.begin(), *this, assign);
++ assign_nodes<table> assign_var(*this);
++ table_impl::fill_buckets(x.begin(), *this, assign_var);
+ }
+
+ void assign(table const& x, true_type)
+@@ -730,9 +730,9 @@
+ // move_assign_nodes takes ownership of the container's
+ // elements, assigning to them if possible, and deleting
+ // any that are left over.
+- move_assign_nodes<table> assign(*this);
++ move_assign_nodes<table> assign_var(*this);
+ node_holder<node_allocator> nodes(x);
+- table_impl::fill_buckets(nodes.begin(), *this, assign);
++ table_impl::fill_buckets(nodes.begin(), *this, assign_var);
+ }
+ }
+
+--- misc/boost_1_55_0/boost/unordered/detail/unique.hpp 2013-08-18 11:44:14.000000000 +0200
++++ misc/build/boost_1_55_0/boost/unordered/detail/unique.hpp 2014-01-07 10:18:27.865432217 +0100
+@@ -529,9 +529,9 @@
+
+ link_pointer end = static_cast<node_pointer>(prev->next_)->next_;
+
+- std::size_t count = this->delete_nodes(prev, end);
++ std::size_t count_var = this->delete_nodes(prev, end);
+ this->fix_bucket(bucket_index, prev);
+- return count;
++ return count_var;
+ }
+
+ iterator erase(c_iterator r)
+@@ -550,19 +550,19 @@
+ return iterator(r2.node_);
+ }
+
+- void erase_nodes(node_pointer begin, node_pointer end)
++ void erase_nodes(node_pointer begin_arg, node_pointer end_arg)
+ {
+- std::size_t bucket_index = this->hash_to_bucket(begin->hash_);
++ std::size_t bucket_index = this->hash_to_bucket(begin_arg->hash_);
+
+- // Find the node before begin.
++ // Find the node before begin_arg
+ link_pointer prev = this->get_previous_start(bucket_index);
+- while(prev->next_ != begin) prev = prev->next_;
++ while(prev->next_ != begin_arg) prev = prev->next_;
+
+ // Delete the nodes.
+ do {
+ this->delete_node(prev);
+ bucket_index = this->fix_bucket(bucket_index, prev);
+- } while (prev->next_ != end);
++ } while (prev->next_ != end_arg);
+ }
+
+ ////////////////////////////////////////////////////////////////////////
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 309d0a8..a63ed37 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -46,6 +46,7 @@ all:
TARFILE_NAME=boost_1_55_0
TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
+PATCH_FILES= $(TARFILE_NAME).patch
CONFIGURE_DIR=
CONFIGURE_ACTION=
commit 0edf5309eb591a7ced0e249df7ec94a358a29274
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Jan 7 09:24:16 2014 +0000
#i123817# remove boost-1.48 patches obsoleted by the boost-1.55 update
diff --git a/boost/boost-os2.patch b/boost/boost-os2.patch
deleted file mode 100644
index ccba8b0..0000000
--- a/boost/boost-os2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- misc/boost_1_48_0/boost/tr1/detail/config.hpp 2010-06-12 11:30:02.000000000 +0200
-+++ misc/build/boost_1_48_0/boost/tr1/detail/config.hpp 2013-07-04 12:49:12.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <cstddef>
-
- #if (defined(__GNUC__) && !(defined(linux) || defined(__linux) || defined(__linux__))) \
-+ && !defined(__OS2__) \
- || (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800))
- // Disable use of #include_next on Linux as typically we are installed in a
- // directory that is searched *after* the std lib include path.
---- misc/boost_1_48_0/boost/tr1/detail/config_all.hpp 2011-07-25 11:28:58.000000000 +0200
-+++ misc/build/boost_1_48_0/boost/tr1/detail/config_all.hpp 2013-07-04 12:50:44.000000000 +0200
-@@ -107,7 +107,7 @@
- # endif
-
- # if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !defined(__ICC) \
-- && (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__))
-+ && (defined(__OS2__) || defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__))
- // Disable use of #include_next on Linux as typically we are installed in a directory that is searched
- // *after* the std lib include path:
- # define BOOST_TR1_DISABLE_INCLUDE_NEXT
-Binary files misc/boost_1_48_0/libs/math/quaternion/TQE_EA.pdf and misc/build/boost_1_48_0/libs/math/quaternion/TQE_EA.pdf differ
diff --git a/boost/boost_1_48_0.patch b/boost/boost_1_48_0.patch
deleted file mode 100644
index e92009f..0000000
--- a/boost/boost_1_48_0.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-diff -ru misc/boost_1_48_0/boost/config/compiler/visualc.hpp misc/build/boost_1_48_0/boost/config/compiler/visualc.hpp
---- misc/boost_1_48_0/boost/config/compiler/visualc.hpp 2011-07-16 15:12:46.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/config/compiler/visualc.hpp 2012-09-18 20:24:01.000000000 -0500
-@@ -102,6 +102,10 @@
- # define BOOST_NO_ADL_BARRIER
- #endif
-
-+#if _MSC_VER >= 1700 // 1700 == VC++ 11.0
-+ // Not in VC11:
-+# define BOOST_NO_0X_HDR_INITIALIZER_LIST
-+#endif
-
- #if (_MSC_VER <= 1600)
- // MSVC (including the latest checked version) has not yet completely
-@@ -169,6 +176,9 @@
- # define BOOST_NO_RTTI
- #endif
-
-+// disable WORKAROUND macro - gives warning for undefined macros
-+#define BOOST_STRICT_CONFIG 1
-+
- //
- // C++0x features
- //
-diff -ru misc/boost_1_48_0/boost/mpl/apply_wrap.hpp misc/build/boost_1_48_0/boost/mpl/apply_wrap.hpp
---- misc/boost_1_48_0/boost/mpl/apply_wrap.hpp 2008-10-11 01:50:46.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/mpl/apply_wrap.hpp 2012-09-18 20:24:01.000000000 -0500
-@@ -173,8 +173,8 @@
- # undef i_
-
- ///// iteration, depth == 2
--
--#elif BOOST_PP_ITERATION_DEPTH() == 2
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 2
-
- # define j_ BOOST_PP_FRAME_ITERATION(2)
-
-@@ -231,4 +231,5 @@
- # undef j_
-
- #endif // BOOST_PP_ITERATION_DEPTH()
-+#endif
- #endif // BOOST_PP_IS_ITERATING
-diff -ru misc/boost_1_48_0/boost/mpl/bind.hpp misc/build/boost_1_48_0/boost/mpl/bind.hpp
---- misc/boost_1_48_0/boost/mpl/bind.hpp 2008-10-11 01:19:02.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/mpl/bind.hpp 2012-09-18 20:24:01.000000000 -0500
-@@ -531,7 +531,8 @@
-
- ///// iteration, depth == 2
-
--#elif BOOST_PP_ITERATION_DEPTH() == 2
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 2
-
- # define j_ BOOST_PP_FRAME_ITERATION(2)
- # if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
-@@ -548,4 +549,5 @@
- # undef j_
-
- #endif // BOOST_PP_ITERATION_DEPTH()
-+#endif
- #endif // BOOST_PP_IS_ITERATING
-diff -ru misc/boost_1_48_0/boost/ptr_container/detail/move.hpp misc/build/boost_1_48_0/boost/ptr_container/detail/move.hpp
---- misc/boost_1_48_0/boost/ptr_container/detail/move.hpp 2008-03-22 16:45:55.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/ptr_container/detail/move.hpp 2012-09-18 20:24:01.000000000 -0500
-@@ -20,7 +20,7 @@
- template<typename Ptr>
- class move_source {
- public:
-- move_source(Ptr& ptr) : ptr_(ptr) {}
-+ move_source(Ptr& _ptr) : ptr_(_ptr) {}
- Ptr& ptr() const { return ptr_; }
- private:
- Ptr& ptr_;
-diff -ru misc/boost_1_48_0/boost/ptr_container/detail/reversible_ptr_container.hpp misc/build/boost_1_48_0/boost/ptr_container/detail/reversible_ptr_container.hpp
---- misc/boost_1_48_0/boost/ptr_container/detail/reversible_ptr_container.hpp 2009-04-05 14:55:59.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/ptr_container/detail/reversible_ptr_container.hpp 2012-09-18 20:24:01.000000000 -0500
-@@ -278,9 +278,9 @@
-
- private:
- template< class ForwardIterator >
-- ForwardIterator advance( ForwardIterator begin, size_type n )
-+ ForwardIterator advance( ForwardIterator _begin, size_type n )
- {
-- ForwardIterator iter = begin;
-+ ForwardIterator iter = _begin;
- std::advance( iter, n );
- return iter;
- }
-diff -ru misc/boost_1_48_0/boost/ptr_container/detail/static_move_ptr.hpp misc/build/boost_1_48_0/boost/ptr_container/detail/static_move_ptr.hpp
---- misc/boost_1_48_0/boost/ptr_container/detail/static_move_ptr.hpp 2008-03-22 16:45:55.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/ptr_container/detail/static_move_ptr.hpp 2012-09-18 20:24:01.000000000 -0500
-@@ -151,7 +151,7 @@
- deleter_const_reference get_deleter() const { return impl_.second(); }
- private:
- template<typename TT, typename DD>
-- void check(const static_move_ptr<TT, DD>& ptr)
-+ void check(const static_move_ptr<TT, DD>& _ptr)
- {
- typedef move_ptrs::is_smart_ptr_convertible<TT, T> convertible;
- BOOST_STATIC_ASSERT(convertible::value);
-diff -ru misc/boost_1_48_0/boost/ptr_container/exception.hpp misc/build/boost_1_48_0/boost/ptr_container/exception.hpp
---- misc/boost_1_48_0/boost/ptr_container/exception.hpp 2008-03-22 16:45:55.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/ptr_container/exception.hpp 2012-09-18 20:24:01.000000000 -0500
-@@ -24,7 +24,7 @@
- {
- const char* what_;
- public:
-- bad_ptr_container_operation( const char* what ) : what_( what )
-+ bad_ptr_container_operation( const char* text ) : what_( text )
- { }
-
- virtual const char* what() const throw()
-@@ -38,7 +38,7 @@
- class bad_index : public bad_ptr_container_operation
- {
- public:
-- bad_index( const char* what ) : bad_ptr_container_operation( what )
-+ bad_index( const char* text ) : bad_ptr_container_operation( text )
- { }
- };
-
-diff -ru misc/boost_1_48_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp misc/build/boost_1_48_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
---- misc/boost_1_48_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2010-04-06 19:41:42.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2012-09-18 20:24:01.000000000 -0500
-@@ -210,7 +210,7 @@
- subrule_list<
- subrule_parser<ID2, DefT2, ContextT2>,
- nil_t> >
-- operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
-+ operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
- {
- return subrule_list<
- self_t,
-@@ -220,7 +220,7 @@
- *this,
- subrule_list<
- subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
-- rhs, nil_t()));
-+ _rhs, nil_t()));
- }
-
- typename DefT::embed_t rhs;
-diff -ru misc/boost_1_48_0/boost/spirit/home/classic/debug/impl/parser_names.ipp misc/build/boost_1_48_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
---- misc/boost_1_48_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2008-06-22 10:05:38.000000000 -0500
-+++ misc/build/boost_1_48_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2012-09-18 20:24:01.000000000 -0500
-@@ -395,13 +395,13 @@
- }
-
- bool register_node(void const *r, char const *name_to_register,
-- bool trace_node)
-+ bool _trace_node)
- {
- if (infos.find(r) != infos.end())
- return false;
-
- return infos.insert(rule_infos::value_type(r,
-- rule_info(std::string(name_to_register), trace_node))
-+ rule_info(std::string(name_to_register), _trace_node))
- ).second;
- }
-
-diff -ru misc/boost_1_48_0/boost/unordered/detail/emplace_args.hpp misc/build/boost_1_48_0/boost/unordered/detail/emplace_args.hpp
---- misc/boost_1_48_0/boost/unordered/detail/emplace_args.hpp
-+++ misc/build/boost_1_48_0/boost/unordered/detail/emplace_args.hpp
-@@ -89,5 +89,5 @@
- BOOST_PP_REPEAT_##z(n, BOOST_UNORDERED_EARGS_MEMBER, _) \
- BOOST_PP_CAT(emplace_args, n) ( \
-- BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, Arg, a) \
-+ BOOST_PP_ENUM_BINARY_PARAMS_Z(z, n, Arg, b) \
- ) : BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_EARGS_INIT, _) \
- {} \
-@@ -99,10 +99,10 @@
- BOOST_PP_ENUM_PARAMS_Z(z, n, A) \
- > create_emplace_args( \
-- BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_FWD_PARAM, a) \
-+ BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_FWD_PARAM, b) \
- ) \
- { \
- BOOST_PP_CAT(emplace_args, n) < \
- BOOST_PP_ENUM_PARAMS_Z(z, n, A) \
-- > e(BOOST_PP_ENUM_PARAMS_Z(z, n, a)); \
-+ > e(BOOST_PP_ENUM_PARAMS_Z(z, n, b)); \
- return e; \
- }
-@@ -116,5 +116,5 @@
- #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \
- BOOST_PP_CAT(a, n)( \
-- boost::forward<BOOST_PP_CAT(A,n)>(BOOST_PP_CAT(a, n)))
-+ boost::forward<BOOST_PP_CAT(A,n)>(BOOST_PP_CAT(b, n)))
-
- #else
-@@ -126,5 +126,5 @@
-
- #define BOOST_UNORDERED_EARGS_INIT(z, n, _) \
-- BOOST_PP_CAT(a, n)(BOOST_PP_CAT(a, n))
-+ BOOST_PP_CAT(a, n)(BOOST_PP_CAT(b, n))
-
- #endif
---- misc/boost_1_48_0/boost/unordered/detail/buckets.hpp 2011-10-09 20:30:10.000000000 +0200
-+++ misc/build/boost_1_48_0/boost/unordered/detail/buckets.hpp 2012-06-21 10:22:36.000000000 +0000
-@@ -477,22 +477,22 @@
-
- // This is called after erasing a node or group of nodes to fix up
- // the bucket pointers.
-- void fix_buckets(bucket_pointer bucket,
-+ void fix_buckets(bucket_pointer bucket_arg,
- previous_pointer prev, node_pointer next)
- {
- if (!next)
- {
-- if (bucket->next_ == prev) bucket->next_ = node_pointer();
-+ if (bucket_arg->next_ == prev) bucket_arg->next_ = node_pointer();
- }
- else
- {
- bucket_pointer next_bucket = this->get_bucket(
- next->hash_ % this->bucket_count_);
-
-- if (next_bucket != bucket)
-+ if (next_bucket != bucket_arg)
- {
- next_bucket->next_ = prev;
-- if (bucket->next_ == prev) bucket->next_ = node_pointer();
-+ if (bucket_arg->next_ == prev) bucket_arg->next_ = node_pointer();
- }
- }
- }
---- misc/boost_1_48_0/boost/unordered/detail/equivalent.hpp 2011-11-04 03:31:36.000000000 +0100
-+++ misc/build/boost_1_48_0/boost/unordered/detail/equivalent.hpp 2012-06-21 10:23:12.000000000 +0000
-@@ -246,14 +246,14 @@
- node_pointer n = this->find_node(k);
- if (!n) return 0;
-
-- std::size_t count = 0;
-+ std::size_t lcl_count = 0;
- node_pointer it = n;
- do {
- it = static_cast<node_pointer>(it->group_prev_);
-- ++count;
-+ ++lcl_count;
- } while(it != n);
-
-- return count;
-+ return lcl_count;
- }
-
- std::pair<iterator, iterator>
-@@ -523,9 +523,9 @@
-
- std::size_t hash = this->hash_function()(k);
- std::size_t bucket_index = hash % this->bucket_count_;
-- bucket_pointer bucket = this->get_bucket(bucket_index);
-+ bucket_pointer lcl_bucket = this->get_bucket(bucket_index);
-
-- previous_pointer prev = bucket->next_;
-+ previous_pointer prev = lcl_bucket->next_;
- if (!prev) return 0;
-
- for (;;)
-@@ -548,7 +548,7 @@
- static_cast<node_pointer>(pos->group_prev_)->next_;
- node_pointer end = static_cast<node_pointer>(end1);
- prev->next_ = end1;
-- this->fix_buckets(bucket, prev, end);
-+ this->fix_buckets(lcl_bucket, prev, end);
- return this->delete_nodes(pos, end);
- }
-
-@@ -557,11 +557,11 @@
- BOOST_ASSERT(r);
- node_pointer next = static_cast<node_pointer>(r->next_);
-
-- bucket_pointer bucket = this->get_bucket(
-+ bucket_pointer lcl_bucket = this->get_bucket(
- r->hash_ % this->bucket_count_);
-- previous_pointer prev = unlink_node(*bucket, r);
-+ previous_pointer prev = unlink_node(*lcl_bucket, r);
-
-- this->fix_buckets(bucket, prev, next);
-+ this->fix_buckets(lcl_bucket, prev, next);
-
- this->delete_node(r);
-
---- misc/boost_1_48_0/boost/unordered/detail/unique.hpp 2011-11-04 03:31:36.000000000 +0100
-+++ misc/build/boost_1_48_0/boost/unordered/detail/unique.hpp 2012-06-21 10:23:00.000000000 +0000
-@@ -523,9 +523,9 @@
-
- std::size_t hash = this->hash_function()(k);
- std::size_t bucket_index = hash % this->bucket_count_;
-- bucket_pointer bucket = this->get_bucket(bucket_index);
-+ bucket_pointer lcl_bucket = this->get_bucket(bucket_index);
-
-- previous_pointer prev = bucket->next_;
-+ previous_pointer prev = lcl_bucket->next_;
- if (!prev) return 0;
-
- for (;;)
-@@ -545,7 +545,7 @@
- node_pointer pos = static_cast<node_pointer>(prev->next_);
- node_pointer end = static_cast<node_pointer>(pos->next_);
- prev->next_ = pos->next_;
-- this->fix_buckets(bucket, prev, end);
-+ this->fix_buckets(lcl_bucket, prev, end);
- return this->delete_nodes(pos, end);
- }
-
-@@ -554,11 +554,11 @@
- BOOST_ASSERT(r);
- node_pointer next = static_cast<node_pointer>(r->next_);
-
-- bucket_pointer bucket = this->get_bucket(
-+ bucket_pointer lcl_bucket = this->get_bucket(
- r->hash_ % this->bucket_count_);
-- previous_pointer prev = unlink_node(*bucket, r);
-+ previous_pointer prev = unlink_node(*lcl_bucket, r);
-
-- this->fix_buckets(bucket, prev, next);
-+ this->fix_buckets(lcl_bucket, prev, next);
-
- this->delete_node(r);
-
diff --git a/boost/boost_freebsd.patch b/boost/boost_freebsd.patch
deleted file mode 100644
index 6c1abfd..0000000
--- a/boost/boost_freebsd.patch
+++ /dev/null
@@ -1,335 +0,0 @@
---- misc/boost_1_48_0/boost/foreach.hpp (revision 75077)
-+++ misc/build/boost_1_48_0/boost/foreach.hpp (revision 75540)
-@@ -166,5 +166,5 @@
- // at the global namespace for your type.
- template<typename T>
--inline boost::foreach::is_lightweight_proxy<T> *
-+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
- boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
-
-@@ -191,5 +191,5 @@
- // at the global namespace for your type.
- template<typename T>
--inline boost::foreach::is_noncopyable<T> *
-+inline boost::BOOST_FOREACH::is_noncopyable<T> *
- boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
-
---- misc/boost_1_48_0/boost/foreach_fwd.hpp (revision 62661)
-+++ misc/build/boost_1_48_0/boost/foreach_fwd.hpp (revision 75540)
-@@ -15,4 +15,6 @@
- #define BOOST_FOREACH_FWD_HPP
-
-+#include <utility> // 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<typename T>
-+ std::pair<T, T> 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<typename T>
-+ struct is_lightweight_proxy
-+ : foreach::is_lightweight_proxy<T>
-+ {};
-+
-+ template<typename T>
-+ struct is_noncopyable
-+ : foreach::is_noncopyable<T>
-+ {};
-+
-+} // namespace BOOST_FOREACH
-+
- } // namespace boost
-
---- misc/boost_1_48_0/boost/interprocess/shared_memory_object.hpp.orig 2012-07-12 15:27:30.607506166 +0200
-+++ misc/build/boost_1_48_0/boost/interprocess/shared_memory_object.hpp 2012-07-12 15:30:22.481507868 +0200
-@@ -1,6 +1,6 @@
- //////////////////////////////////////////////////////////////////////////////
- //
--// (C) Copyright Ion Gaztanaga 2005-2009. Distributed under the Boost
-+// (C) Copyright Ion Gaztanaga 2005-2011. 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)
- //
-@@ -251,7 +251,7 @@
-
- #if defined(__FreeBSD__)
-
--inline bool use_filesistem_based_posix()
-+inline bool use_filesystem_based_posix()
- {
- int jailed = 0;
- std::size_t len = sizeof(jailed);
-@@ -275,7 +275,7 @@
- #if defined(BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SHARED_MEMORY)
- const bool add_leading_slash = false;
- #elif defined(BOOST_INTERPROCESS_RUNTIME_FILESYSTEM_BASED_POSIX_SHARED_MEMORY)
-- const bool add_leading_slash = !shared_memory_object_ipcdetail::use_filesistem_based_posix();
-+ const bool add_leading_slash = !shared_memory_object_detail::use_filesystem_based_posix();
- #else
- const bool add_leading_slash = true;
- #endif
-@@ -361,7 +361,7 @@
- #if defined(BOOST_INTERPROCESS_FILESYSTEM_BASED_POSIX_SHARED_MEMORY)
- const bool add_leading_slash = false;
- #elif defined(BOOST_INTERPROCESS_RUNTIME_FILESYSTEM_BASED_POSIX_SHARED_MEMORY)
-- const bool add_leading_slash = !shared_memory_object_ipcdetail::use_filesistem_based_posix();
-+ const bool add_leading_slash = !shared_memory_object_detail::use_filesystem_based_posix();
- #else
- const bool add_leading_slash = true;
- #endif
---- misc/boost_1_48_0/boost/config/compiler/clang.hpp.orig 2010-10-01 11:19:44.000000000 +0200
-+++ misc/build/boost_1_48_0/boost/config/compiler/clang.hpp 2012-02-29 15:20:25.157457434 +0100
-@@ -60,4 +60,4 @@
-
- // Macro used to identify the Clang compiler.
- #define BOOST_CLANG 1
--
-+#define BOOST_HAS_LONG_LONG 1
---- misc/boost_1_48_0/boost/config/compiler/gcc.hpp.orig 2010-10-01 09:19:44.000000000 +0000
-+++ misc/build/boost_1_48_0/boost/config/compiler/gcc.hpp 2010-11-20 10:59:22.000000000 +0000
-@@ -146,6 +149,13 @@
- # endif
- #endif
-
-+//
-+// gcc previous to 4.3.x does not implement inclass member initialization
-+//
-+#if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2))
-+# define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-+#endif
-+
- // C++0x features not implemented in any GCC version
- //
- #define BOOST_NO_CONSTEXPR
-Index: boost/archive/shared_ptr_helper.hpp
-===================================================================
---- misc/boost_1_48_0/boost/archive/shared_ptr_helper.hpp (revision 55789)
-+++ misc/build/boost_1_48_0/boost/archive/shared_ptr_helper.hpp (revision 57981)
-@@ -109,5 +110,5 @@
- static const boost::serialization::extended_type_info *
- get_object_identifier(T & t){
-- return boost::serialization::singleton<
-+ return & boost::serialization::singleton<
- BOOST_DEDUCED_TYPENAME
- boost::serialization::type_info_implementation<T>::type
---- misc/boost_1_48_0/boost/asio/detail/io_control.hpp.orig 2011-06-06 03:21:43.000000000 +0400
-+++ misc/build/boost_1_48_0/boost/asio/detail/io_control.hpp 2012-07-10 13:24:45.000000000 +0400
-@@ -44,9 +44,9 @@
- }
-
- // Get the name of the IO control command.
-- int name() const
-+ ioctl_cmd_type name() const
- {
-- return static_cast<int>(FIONBIO);
-+ return static_cast<ioctl_cmd_type>(FIONBIO);
- }
-
- // Set the value of the I/O control command.
-@@ -94,9 +94,9 @@
- }
-
- // Get the name of the IO control command.
-- int name() const
-+ ioctl_cmd_type name() const
- {
-- return static_cast<int>(FIONREAD);
-+ return static_cast<ioctl_cmd_type>(FIONREAD);
- }
-
- // Set the value of the I/O control command.
---- misc/boost_1_48_0/boost/asio/detail/descriptor_ops.hpp.orig 2010-12-06 01:55:08.000000000 +0300
-+++ misc/build/boost_1_48_0/boost/asio/detail/descriptor_ops.hpp 2010-12-06 01:55:39.000000000 +0300
-@@ -79,7 +79,7 @@
- const buf* bufs, std::size_t count,
- boost::system::error_code& ec, std::size_t& bytes_transferred);
-
--BOOST_ASIO_DECL int ioctl(int d, state_type& state, long cmd,
-+BOOST_ASIO_DECL int ioctl(int d, state_type& state, ioctl_cmd_type cmd,
- ioctl_arg_type* arg, boost::system::error_code& ec);
-
- BOOST_ASIO_DECL int fcntl(int d, long cmd, boost::system::error_code& ec);
---- misc/boost_1_48_0/boost/asio/detail/socket_ops.hpp.orig 2010-12-06 01:58:36.000000000 +0300
-+++ misc/build/boost_1_48_0/boost/asio/detail/socket_ops.hpp 2010-12-06 01:59:42.000000000 +0300
-@@ -222,7 +222,7 @@
- std::size_t* addrlen, boost::system::error_code& ec);
-
- BOOST_ASIO_DECL int ioctl(socket_type s, state_type& state,
-- int cmd, ioctl_arg_type* arg, boost::system::error_code& ec);
-+ ioctl_cmd_type cmd, ioctl_arg_type* arg, boost::system::error_code& ec);
-
- BOOST_ASIO_DECL int select(int nfds, fd_set* readfds, fd_set* writefds,
- fd_set* exceptfds, timeval* timeout, boost::system::error_code& ec);
---- misc/boost_1_48_0/boost/asio/detail/impl/descriptor_ops.ipp.orig 2010-12-06 01:44:38.000000000 +0300
-+++ misc/build/boost_1_48_0/boost/asio/detail/impl/descriptor_ops.ipp 2010-12-06 01:41:33.000000000 +0300
-@@ -251,7 +251,7 @@
- }
- }
-
--int ioctl(int d, state_type& state, long cmd,
-+int ioctl(int d, state_type& state, ioctl_cmd_type cmd,
- ioctl_arg_type* arg, boost::system::error_code& ec)
- {
- if (d == -1)
-@@ -273,7 +273,7 @@
- // descriptor is put into the state that has been requested by the user. If
- // the ioctl syscall was successful then we need to update the flags to
- // match.
-- if (cmd == static_cast<long>(FIONBIO))
-+ if (cmd == static_cast<ioctl_cmd_type>(FIONBIO))
- {
- if (*arg)
- {
---- misc/boost_1_48_0/boost/asio/detail/impl/socket_ops.ipp.orig 2010-12-06 01:46:05.000000000 +0300
-+++ misc/build/boost_1_48_0/boost/asio/detail/impl/socket_ops.ipp 2010-12-06 01:49:39.000000000 +0300
-@@ -1414,7 +1414,7 @@
- return result;
- }
-
--int ioctl(socket_type s, state_type& state, int cmd,
-+int ioctl(socket_type s, state_type& state, ioctl_cmd_type cmd,
- ioctl_arg_type* arg, boost::system::error_code& ec)
- {
- if (s == invalid_socket)
-@@ -1424,15 +1424,10 @@
- }
-
- clear_last_error();
--#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-- int result = error_wrapper(::ioctlsocket(s, cmd, arg), ec);
--#elif defined(__MACH__) && defined(__APPLE__) \
-- || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+
- int result = error_wrapper(::ioctl(s,
-- static_cast<unsigned int>(cmd), arg), ec);
--#else
-- int result = error_wrapper(::ioctl(s, cmd, arg), ec);
--#endif
-+ static_cast<ioctl_cmd_type>(cmd), arg), ec);
-+
- if (result >= 0)
- {
- ec = boost::system::error_code();
-@@ -1442,7 +1437,7 @@
- // the correct state. This ensures that the underlying socket is put into
- // the state that has been requested by the user. If the ioctl syscall was
- // successful then we need to update the flags to match.
-- if (cmd == static_cast<int>(FIONBIO))
-+ if (cmd == static_cast<ioctl_cmd_type>(FIONBIO))
- {
- if (*arg)
- {
---- misc/boost_1_48_0/boost/asio/detail/socket_types.hpp.orig 2010-12-06 01:35:39.000000000 +0300
-+++ misc/build/boost_1_48_0/boost/asio/detail/socket_types.hpp 2010-12-06 01:36:05.000000000 +0300
-@@ -147,6 +147,12 @@
- typedef sockaddr_storage sockaddr_storage_type;
- typedef sockaddr_un sockaddr_un_type;
- typedef addrinfo addrinfo_type;
-+#if (defined(__MACH__) && defined(__APPLE__)) || defined(__DragonFly__) || \
-+ defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+typedef unsigned long ioctl_cmd_type;
-+#else
-+typedef int ioctl_cmd_type;
-+#endif
- typedef int ioctl_arg_type;
- typedef uint32_t u_long_type;
- typedef uint16_t u_short_type;
---- 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)),
- // but is now more parsimonious: just rounding up to the minimum required alignment of our housekeeping data
- // when required. This works provided all alignments are powers of two.
-- size_type s = (std::max)(requested_size, min_alloc_size);
-+ size_type s = (std::max)(requested_size, static_cast <size_type> (min_alloc_size));
- size_type rem = s % min_align;
- if(rem)
- s += min_align - rem;
---- misc/boost_1_48_0/boostcpp.jam.orig 2011-12-15 18:33:48.000000000 +0300
-+++ misc/build/boost_1_48_0/boostcpp.jam 2011-12-15 18:34:05.000000000 +0300
-@@ -154,7 +154,7 @@
- # suffixes either. Pgi compilers can not accept library with version
- # suffix.
- if $(type) = SHARED_LIB &&
-- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
-+ ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix freebsd ) &&
- ! ( [ $(property-set).get <toolset> ] in pgi ) )
- {
- result = $(result).$(BOOST_VERSION) ;
---- misc/boost_1_48_0/libs/filesystem/v2/src/v2_path.cpp.orig 2010-12-29 19:23:18.000000000 +0100
-+++ misc/build/boost_1_48_0/libs/filesystem/v2/src/v2_path.cpp 2010-12-29 19:23:54.000000000 +0100
-@@ -45,7 +45,7 @@
- {
- #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__)
- // ISO C calls this "the locale-specific native environment":
-- static std::locale lc("");
-+ static std::locale lc;
- #else // Mac OS
- // "All BSD system functions expect their string parameters to be in UTF-8 encoding
- // and nothing else."
---- misc/boost_1_48_0/libs/filesystem/v3/src/path.cpp.orig 2011-12-15 17:38:14.000000000 +0300
-+++ misc/build/boost_1_48_0/libs/filesystem/v3/src/path.cpp 2011-12-15 17:51:50.000000000 +0300
-@@ -767,7 +767,7 @@
- // or LANG are wrong, for example), so dynamic initialization is used to ensure
- // that exceptions can be caught.
-
-- return std::locale("");
-+ return std::locale();
-
- # endif
- }
---- misc/boost_1_48_0/tools/build/v2/engine/build.jam.orig Tue Jul 29 15:43:31 2008
-+++ misc/build/boost_1_48_0/tools/build/v2/engine/build.jam Tue Nov 11 23:52:09 2008
-@@ -176,7 +176,7 @@
- ## GCC 2.x, 3.x, 4.x
- toolset gcc gcc : "-o " : -D
- : -pedantic -fno-strict-aliasing
-- [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
-+ [ opt --release : [ opt --symbols : -g : -s ] -O3 -fno-strict-aliasing ]
- [ opt --debug : -g -O0 -fno-inline ]
- -I$(--python-include) -I$(--extra-include) -Wno-long-long
- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
---- misc/boost_1_48_0/tools/build/v2/tools/common.jam.orig 2009-09-23 16:39:31.000000000 +0400
-+++ misc/build/boost_1_48_0/tools/build/v2/tools/common.jam 2009-09-23 16:39:33.000000000 +0400
-@@ -765,14 +765,6 @@
- result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
- $(property-set) ] ] ;
-
-- case <threading> :
-- result += [ join-tag $(f:G=) : [ threading-tag $(name) : $(type)
-- : $(property-set) ] ] ;
--
-- case <runtime> :
-- result += [ join-tag $(f:G=) : [ runtime-tag $(name) : $(type) :
-- $(property-set) ] ] ;
--
- case <qt> :
- result += [ join-tag $(f:G=) : [ qt-tag $(name) : $(type) :
- $(property-set) ] ] ;
commit 5a81299b05da6f1f9ec81246abe54c55f49793a4
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Jan 7 08:45:56 2014 +0000
#i123986# fix charmap accessibility for code points beyond the unicode baseplane
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index f1bfc39..907a9c3 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -705,11 +705,12 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
ensureAlive();
String sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE );
- sal_Unicode c = mpParent->maText.GetChar(0);
+ const rtl::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;
- int tmp_len = 4;
- if(c_Shifted>0xFFFF) tmp_len = 8;
+ sal_UCS4 c_Shifted = c;
for( int i = 0; i < tmp_len; ++i )
{
char h = c_Shifted & 0x0F;
More information about the Libreoffice-commits
mailing list