Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 11 additions & 28 deletions include/boost/graph/detail/permutation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@ namespace boost
template < class Iter1, class Iter2 >
void permute_serial(Iter1 permuter, Iter1 last, Iter2 result)
{
#ifdef BOOST_NO_STD_ITERATOR_TRAITS
typedef std::ptrdiff_t D :
#else
typedef typename std::iterator_traits< Iter1 >::difference_type D;
#endif

D n
= 0;
using D = typename std::iterator_traits< Iter1 >::difference_type;
D n = 0;

while (permuter != last)
{
std::swap(result[n], result[*permuter]);
Expand All @@ -37,11 +32,8 @@ void permute_serial(Iter1 permuter, Iter1 last, Iter2 result)
template < class InIter, class RandIterP, class RandIterR >
void permute_copy(InIter first, InIter last, RandIterP p, RandIterR result)
{
#ifdef BOOST_NO_STD_ITERATOR_TRAITS
typedef std::ptrdiff_t i = 0;
#else
typename std::iterator_traits< RandIterP >::difference_type i = 0;
#endif

for (; first != last; ++first, ++i)
result[p[i]] = *first;
}
Expand Down Expand Up @@ -90,13 +82,9 @@ void permute(RandIter first, RandIter last, RandIterPerm p)
// WARNING: T must be a signed integer!
template < class PermIter > void invert_permutation(PermIter X, PermIter Xend)
{
#ifdef BOOST_NO_STD_ITERATOR_TRAITS
typedef std::ptrdiff_t T :
#else
typedef typename std::iterator_traits< PermIter >::value_type T;
#endif
T n
= Xend - X;
using T = typename std::iterator_traits< PermIter >::value_type;

T n = Xend - X;
T m = n;
T j = -1;

Expand Down Expand Up @@ -125,15 +113,10 @@ template < class PermIter > void invert_permutation(PermIter X, PermIter Xend)
template < class Iter1, class Iter2, class Iter3 >
inline void serialize_permutation(Iter1 q, Iter1 q_end, Iter2 q_inv, Iter3 p)
{
#ifdef BOOST_NO_STD_ITERATOR_TRAITS
typedef std::ptrdiff_t P1;
typedef std::ptrdiff_t P2;
typedef std::ptrdiff_t D;
#else
typedef typename std::iterator_traits< Iter1 >::value_type P1;
typedef typename std::iterator_traits< Iter2 >::value_type P2;
typedef typename std::iterator_traits< Iter1 >::difference_type D;
#endif
using P1 = typename std::iterator_traits< Iter1 >::value_type;
using P2 = typename std::iterator_traits< Iter2 >::value_type;
using D = typename std::iterator_traits< Iter1 >::difference_type;

D n = q_end - q;
for (D i = 0; i < n; ++i)
{
Expand Down
Loading