summaryrefslogtreecommitdiff
path: root/external/boost
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-04-02 11:40:45 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-04-02 12:15:49 +0200
commitc3986c90e329af98520bda1ad11ecf6d059d50e1 (patch)
tree0ce1f941ca3cc074015a415283b29e4a2e2df6c5 /external/boost
parentedb4c11b074e486a4fc071ea94c9c4a1c83e84a3 (diff)
These changes are not needed any more
Moreover these line causes the same Wshadow warning which was the reason of adding them. Change-Id: I6b5793b66db26720626b7924d59e9283168f8abe
Diffstat (limited to 'external/boost')
-rw-r--r--external/boost/boost.libcdr.warnings.patch.197
1 files changed, 0 insertions, 97 deletions
diff --git a/external/boost/boost.libcdr.warnings.patch.1 b/external/boost/boost.libcdr.warnings.patch.1
index 22888c464b7a..12a7ea251015 100644
--- a/external/boost/boost.libcdr.warnings.patch.1
+++ b/external/boost/boost.libcdr.warnings.patch.1
@@ -1,100 +1,3 @@
---- boost/boost/multi_index/detail/index_matcher.hpp 2008-07-03 18:51:53.000000000 +0200
-+++ boost/boost/multi_index/detail/index_matcher.hpp 2013-05-17 15:30:12.539099597 +0200
-@@ -132,17 +132,17 @@
- entries(),entries()+size_,
- entry(node),entry::less_by_node()); /* localize entry */
- ent->ordered=false;
-- std::size_t n=ent->pos; /* get its position */
-+ std::size_t n_=ent->pos; /* get its position */
-
- entry dummy(0);
-- dummy.pile_top=n;
-+ dummy.pile_top=n_;
-
- entry* pile_ent= /* find the first available pile */
- std::lower_bound( /* to stack the entry */
- entries(),entries()+num_piles,
- dummy,entry::less_by_pile_top());
-
-- pile_ent->pile_top=n; /* stack the entry */
-+ pile_ent->pile_top=n_; /* stack the entry */
- pile_ent->pile_top_entry=ent;
-
- /* if not the first pile, link entry to top of the preceding pile */
-@@ -164,7 +164,7 @@
- */
-
- entry* ent=entries()[num_piles-1].pile_top_entry;
-- for(std::size_t n=num_piles;n--;){
-+ for(std::size_t n_=num_piles;n_--;){
- ent->ordered=true;
- ent=ent->previous;
- }
---- boost/boost/multi_index/ordered_index.hpp 2010-07-25 12:44:55.000000000 +0200
-+++ boost/boost/multi_index/ordered_index.hpp 2013-05-17 15:33:42.785182819 +0200
-@@ -436,9 +436,9 @@
-
- template<typename CompatibleKey,typename CompatibleCompare>
- iterator find(
-- const CompatibleKey& x,const CompatibleCompare& comp)const
-+ const CompatibleKey& x,const CompatibleCompare& comp_)const
- {
-- return make_iterator(ordered_index_find(root(),header(),key,x,comp));
-+ return make_iterator(ordered_index_find(root(),header(),key,x,comp_));
- }
-
- template<typename CompatibleKey>
-@@ -448,9 +448,9 @@
- }
-
- template<typename CompatibleKey,typename CompatibleCompare>
-- size_type count(const CompatibleKey& x,const CompatibleCompare& comp)const
-+ size_type count(const CompatibleKey& x,const CompatibleCompare& comp_)const
- {
-- std::pair<iterator,iterator> p=equal_range(x,comp);
-+ std::pair<iterator,iterator> p=equal_range(x,comp_);
- size_type n=std::distance(p.first,p.second);
- return n;
- }
-@@ -464,10 +464,10 @@
-
- template<typename CompatibleKey,typename CompatibleCompare>
- iterator lower_bound(
-- const CompatibleKey& x,const CompatibleCompare& comp)const
-+ const CompatibleKey& x,const CompatibleCompare& comp_)const
- {
- return make_iterator(
-- ordered_index_lower_bound(root(),header(),key,x,comp));
-+ ordered_index_lower_bound(root(),header(),key,x,comp_));
- }
-
- template<typename CompatibleKey>
-@@ -479,10 +479,10 @@
-
- template<typename CompatibleKey,typename CompatibleCompare>
- iterator upper_bound(
-- const CompatibleKey& x,const CompatibleCompare& comp)const
-+ const CompatibleKey& x,const CompatibleCompare& comp_)const
- {
- return make_iterator(
-- ordered_index_upper_bound(root(),header(),key,x,comp));
-+ ordered_index_upper_bound(root(),header(),key,x,comp_));
- }
-
- template<typename CompatibleKey>
-@@ -497,10 +497,10 @@
-
- template<typename CompatibleKey,typename CompatibleCompare>
- std::pair<iterator,iterator> equal_range(
-- const CompatibleKey& x,const CompatibleCompare& comp)const
-+ const CompatibleKey& x,const CompatibleCompare& comp_)const
- {
- std::pair<node_type*,node_type*> p=
-- ordered_index_equal_range(root(),header(),key,x,comp);
-+ ordered_index_equal_range(root(),header(),key,x,comp_);
- return std::pair<iterator,iterator>(
- make_iterator(p.first),make_iterator(p.second));
- }
--- boost/boost/multi_index/sequenced_index.hpp 2008-07-03 18:51:53.000000000 +0200
+++ boost/boost/multi_index/sequenced_index.hpp 2013-05-17 15:44:15.265289335 +0200
@@ -346,7 +346,7 @@