From f6333c31269557ec6aefc46a2a627a31df33d149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Fri, 1 Aug 2014 10:58:30 +0200 Subject: [PATCH] Replaced tabs with spaces. Removed unneeded TTI include in utilities --- .../boost/intrusive/detail/hashtable_node.hpp | 2 +- include/boost/intrusive/detail/mpl.hpp | 2 +- include/boost/intrusive/detail/utilities.hpp | 129 +++++++++--------- include/boost/intrusive/pointer_traits.hpp | 12 +- include/boost/intrusive/priority_compare.hpp | 6 +- 5 files changed, 75 insertions(+), 76 deletions(-) diff --git a/include/boost/intrusive/detail/hashtable_node.hpp b/include/boost/intrusive/detail/hashtable_node.hpp index f00b0bf..68122f0 100644 --- a/include/boost/intrusive/detail/hashtable_node.hpp +++ b/include/boost/intrusive/detail/hashtable_node.hpp @@ -205,7 +205,7 @@ struct get_slist_impl < typename NodeTraits::node , boost::intrusive::value_traits , boost::intrusive::constant_time_size - , boost::intrusive::size_type + , boost::intrusive::size_type >::type {}; }; diff --git a/include/boost/intrusive/detail/mpl.hpp b/include/boost/intrusive/detail/mpl.hpp index 9dc0d52..1ac762a 100644 --- a/include/boost/intrusive/detail/mpl.hpp +++ b/include/boost/intrusive/detail/mpl.hpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // -// (C) Copyright Ion Gaztanaga 2006-2014 +// (C) Copyright Ion Gaztanaga 2006-2014 // (C) Copyright Microsoft Corporation 2014 // // Distributed under the Boost Software License, Version 1.0. diff --git a/include/boost/intrusive/detail/utilities.hpp b/include/boost/intrusive/detail/utilities.hpp index b893d22..01b84ba 100644 --- a/include/boost/intrusive/detail/utilities.hpp +++ b/include/boost/intrusive/detail/utilities.hpp @@ -31,7 +31,6 @@ #include #include #include -#include namespace boost { namespace intrusive { @@ -388,7 +387,7 @@ void destructor_impl(Hook &, detail::link_dispatch) #define BOOST_INTRUSIVE_BSR_INTRINSIC_64_BIT #endif - #ifndef __INTRIN_H_ // Avoid including any windows system header + #ifndef __INTRIN_H_ // Avoid including any windows system header #ifdef __cplusplus extern "C" { #endif // __cplusplus @@ -783,108 +782,108 @@ class array_initializer template class reverse_iterator - : public std::iterator< - typename std::iterator_traits::iterator_category, - typename std::iterator_traits::value_type, - typename std::iterator_traits::difference_type, - typename std::iterator_traits::pointer, - typename std::iterator_traits::reference> + : public std::iterator< + typename std::iterator_traits::iterator_category, + typename std::iterator_traits::value_type, + typename std::iterator_traits::difference_type, + typename std::iterator_traits::pointer, + typename std::iterator_traits::reference> { public: - typedef typename std::iterator_traits::pointer pointer; - typedef typename std::iterator_traits::reference reference; - typedef typename std::iterator_traits::difference_type difference_type; - typedef It iterator_type; + typedef typename std::iterator_traits::pointer pointer; + typedef typename std::iterator_traits::reference reference; + typedef typename std::iterator_traits::difference_type difference_type; + typedef It iterator_type; - reverse_iterator(){} + reverse_iterator(){} - explicit reverse_iterator(It r) - : m_current(r) + explicit reverse_iterator(It r) + : m_current(r) {} - template - reverse_iterator(const reverse_iterator& r) - : m_current(r.base()) - {} + template + reverse_iterator(const reverse_iterator& r) + : m_current(r.base()) + {} - It base() const + It base() const { return m_current; } - reference operator*() const + reference operator*() const { It temp(m_current); --temp; return *temp; } - pointer operator->() const + pointer operator->() const { It temp(m_current); --temp; return temp.operator->(); } - reference operator[](difference_type off) const - { return this->m_current[-off]; } + reference operator[](difference_type off) const + { return this->m_current[-off]; } - reverse_iterator& operator++() + reverse_iterator& operator++() { --m_current; return *this; } - reverse_iterator operator++(int) - { - reverse_iterator temp = *this; - --m_current; - return temp; - } - - reverse_iterator& operator--() - { - ++m_current; - return *this; + reverse_iterator operator++(int) + { + reverse_iterator temp = *this; + --m_current; + return temp; } - reverse_iterator operator--(int) - { - reverse_iterator temp(*this); - ++m_current; - return temp; - } + reverse_iterator& operator--() + { + ++m_current; + return *this; + } - friend bool operator==(const reverse_iterator& l, const reverse_iterator& r) - { return l.m_current == r.m_current; } + reverse_iterator operator--(int) + { + reverse_iterator temp(*this); + ++m_current; + return temp; + } - friend bool operator!=(const reverse_iterator& l, const reverse_iterator& r) - { return l.m_current != r.m_current; } + friend bool operator==(const reverse_iterator& l, const reverse_iterator& r) + { return l.m_current == r.m_current; } - friend bool operator<(const reverse_iterator& l, const reverse_iterator& r) - { return l.m_current < r.m_current; } + friend bool operator!=(const reverse_iterator& l, const reverse_iterator& r) + { return l.m_current != r.m_current; } - friend bool operator<=(const reverse_iterator& l, const reverse_iterator& r) - { return l.m_current <= r.m_current; } + friend bool operator<(const reverse_iterator& l, const reverse_iterator& r) + { return l.m_current < r.m_current; } - friend bool operator>(const reverse_iterator& l, const reverse_iterator& r) - { return l.m_current > r.m_current; } + friend bool operator<=(const reverse_iterator& l, const reverse_iterator& r) + { return l.m_current <= r.m_current; } - friend bool operator>=(const reverse_iterator& l, const reverse_iterator& r) - { return l.m_current >= r.m_current; } + friend bool operator>(const reverse_iterator& l, const reverse_iterator& r) + { return l.m_current > r.m_current; } - reverse_iterator& operator+=(difference_type off) - { m_current -= off; return *this; } + friend bool operator>=(const reverse_iterator& l, const reverse_iterator& r) + { return l.m_current >= r.m_current; } - friend reverse_iterator operator+(const reverse_iterator & l, difference_type off) - { + reverse_iterator& operator+=(difference_type off) + { m_current -= off; return *this; } + + friend reverse_iterator operator+(const reverse_iterator & l, difference_type off) + { reverse_iterator tmp(l.m_current); tmp.m_current -= off; return tmp; } - reverse_iterator& operator-=(difference_type off) - { m_current += off; return *this; } + reverse_iterator& operator-=(difference_type off) + { m_current += off; return *this; } - friend reverse_iterator operator-(const reverse_iterator & l, difference_type off) - { + friend reverse_iterator operator-(const reverse_iterator & l, difference_type off) + { reverse_iterator tmp(l.m_current); tmp.m_current += off; return tmp; } - friend difference_type operator-(const reverse_iterator& l, const reverse_iterator& r) - { return r.m_current - l.m_current; } + friend difference_type operator-(const reverse_iterator& l, const reverse_iterator& r) + { return r.m_current - l.m_current; } private: - It m_current; // the wrapped iterator + It m_current; // the wrapped iterator }; template diff --git a/include/boost/intrusive/pointer_traits.hpp b/include/boost/intrusive/pointer_traits.hpp index fe898f6..d16471c 100644 --- a/include/boost/intrusive/pointer_traits.hpp +++ b/include/boost/intrusive/pointer_traits.hpp @@ -190,12 +190,12 @@ struct pointer_traits static pointer priv_dynamic_cast_from(boost::intrusive::detail::false_, const UPtr &uptr) { element_type *p = dynamic_cast(&*uptr); - if(!p){ - return pointer(); - } - else{ - return pointer_to(*p); - } + if(!p){ + return pointer(); + } + else{ + return pointer_to(*p); + } } ///@endcond }; diff --git a/include/boost/intrusive/priority_compare.hpp b/include/boost/intrusive/priority_compare.hpp index f6beee1..e2f4495 100644 --- a/include/boost/intrusive/priority_compare.hpp +++ b/include/boost/intrusive/priority_compare.hpp @@ -25,9 +25,9 @@ template struct priority_compare { //Compatibility with std::binary_function - typedef T first_argument_type; - typedef T second_argument_type; - typedef bool result_type; + typedef T first_argument_type; + typedef T second_argument_type; + typedef bool result_type; bool operator()(const T &val, const T &val2) const {