c_cpp/boost
SHA256
8
0
Fork 0
forked from pool/boost
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=20

Browse Source
This commit is contained in:
Philipp Thomas
2010-04-20 16:20:54 +00:00
committed by Git OBS Bridge
parent 529c03d00f
commit c76cf89cd6
26 changed files with 1276 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

344
boost-fix_ifdefs.patch Normal file
View File

@@ -0,0 +1,344 @@
Index: boost/intrusive/hashtable.hpp
===================================================================
--- boost/intrusive/hashtable.hpp.orig 2009-10-15 20:46:26.000000000 +0200
+++ boost/intrusive/hashtable.hpp 2010-04-08 13:51:49.307002153 +0200
@@ -570,6 +570,7 @@ template<class T, class ...Options>
#else
template<class Config>
#endif
+
class hashtable_impl
: private detail::clear_on_destructor_base<hashtable_impl<Config> >
{
@@ -2879,15 +2880,16 @@ template < class T
#else
template <class T, bool UniqueKeys, class ...Options>
#endif
+
struct make_hashtable_opt
{
typedef typename pack_options
< uset_defaults<T>,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4, O5, O6, O7, O8, O9, O10
- #else
+#else
Options...
- #endif
+#endif
>::type packed_options;
//Real value traits must be calculated from options
@@ -2947,17 +2949,18 @@ template<class T, class O1 = none, class
, class O9 = none, class O10= none
>
#endif
+
struct make_hashtable
{
/// @cond
typedef hashtable_impl
< typename make_hashtable_opt
<T, false,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4, O5, O6, O7, O8, O9, O10
- #else
+#else
Options...
- #endif
+#endif
>::type
> implementation_defined;
@@ -2972,21 +2975,22 @@ template<class T, class ...Options>
#else
template<class T, class O1, class O2, class O3, class O4, class O5, class O6, class O7, class O8, class O9, class O10>
#endif
+
class hashtable
: public make_hashtable<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4, O5, O6, O7, O8, O9, O10
- #else
+#else
Options...
- #endif
+#endif
>::type
{
typedef typename make_hashtable<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4, O5, O6, O7, O8, O9, O10
- #else
+#else
Options...
- #endif
+#endif
>::type Base;
public:
@@ -3011,7 +3015,7 @@ class hashtable
{}
};
-#endif
+#endif // BOOST_INTRUSIVE_DOXYGEN_INVOKED
} //namespace intrusive
} //namespace boost
Index: boost/intrusive/rbtree.hpp
===================================================================
--- boost/intrusive/rbtree.hpp.orig 2009-10-15 20:46:26.000000000 +0200
+++ boost/intrusive/rbtree.hpp 2010-04-08 13:55:55.579002923 +0200
@@ -865,11 +865,11 @@ class rbtree_impl
return ret;
}
- #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
+#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
- #endif
+#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//!
@@ -1530,11 +1530,11 @@ struct make_rbtree_opt
{
typedef typename pack_options
< set_defaults<T>,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type packed_options;
typedef typename detail::get_value_traits
<T, typename packed_options::value_traits>::type value_traits;
@@ -1561,11 +1561,11 @@ struct make_rbtree
/// @cond
typedef rbtree_impl
< typename make_rbtree_opt<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type
> implementation_defined;
/// @endcond
@@ -1581,20 +1581,20 @@ template<class T, class ...Options>
#endif
class rbtree
: public make_rbtree<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type
{
typedef typename make_rbtree
<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type Base;
public:
@@ -1632,7 +1632,7 @@ class rbtree
{ return static_cast<const rbtree &>(Base::container_from_iterator(it)); }
};
-#endif
+#endif //!BOOST_INTRUSIVE_VARIADIC_TEMPLATES
} //namespace intrusive
Index: boost/intrusive/sgtree.hpp
===================================================================
--- boost/intrusive/sgtree.hpp.orig 2009-10-15 20:46:26.000000000 +0200
+++ boost/intrusive/sgtree.hpp 2010-04-08 13:58:34.839825416 +0200
@@ -1048,11 +1048,11 @@ class sgtree_impl
return ret;
}
- #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
+#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
- #endif
+#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//!
@@ -1770,11 +1770,11 @@ struct make_sgtree_opt
{
typedef typename pack_options
< sg_set_defaults<T>,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type packed_options;
typedef typename detail::get_value_traits
<T, typename packed_options::value_traits>::type value_traits;
@@ -1801,11 +1801,11 @@ struct make_sgtree
/// @cond
typedef sgtree_impl
< typename make_sgtree_opt<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type
> implementation_defined;
/// @endcond
@@ -1820,20 +1820,20 @@ template<class T, class ...Options>
#endif
class sgtree
: public make_sgtree<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type
{
typedef typename make_sgtree
<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type Base;
public:
@@ -1865,7 +1865,7 @@ class sgtree
{ return static_cast<const sgtree &>(Base::container_from_end_iterator(end_iterator)); }
};
-#endif
+#endif //!BOOST_INTRUSIVE_DOXYGEN_INVOKED
} //namespace intrusive
Index: boost/intrusive/treap.hpp
===================================================================
--- boost/intrusive/treap.hpp.orig 2009-10-15 20:46:26.000000000 +0200
+++ boost/intrusive/treap.hpp 2010-04-08 14:00:00.043511275 +0200
@@ -976,11 +976,11 @@ class treap_impl
return ret;
}
- #if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
+#if !defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED)
template<class Disposer>
iterator erase_and_dispose(iterator i, Disposer disposer)
{ return this->erase_and_dispose(const_iterator(i), disposer); }
- #endif
+#endif
//! <b>Requires</b>: Disposer::operator()(pointer) shouldn't throw.
//!
@@ -1629,11 +1629,11 @@ struct make_treap_opt
{
typedef typename pack_options
< treap_set_defaults<T>,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type packed_options;
typedef typename detail::get_value_traits
<T, typename packed_options::value_traits>::type value_traits;
@@ -1661,11 +1661,11 @@ struct make_trie
/// @cond
typedef treap_impl
< typename make_treap_opt<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type
> implementation_defined;
/// @endcond
@@ -1681,20 +1681,20 @@ template<class T, class ...Options>
#endif
class treap
: public make_trie<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type
{
typedef typename make_trie
<T,
- #if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
+#if !defined(BOOST_INTRUSIVE_VARIADIC_TEMPLATES)
O1, O2, O3, O4
- #else
+#else
Options...
- #endif
+#endif
>::type Base;
public:
@@ -1735,7 +1735,7 @@ class treap
{ return static_cast<const treap &>(Base::container_from_iterator(it)); }
};
-#endif
+#endif // !BOOST_INTRUSIVE_DOXYGEN_INVOKED
} //namespace intrusive