aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-08-07 19:31:22 +0200
committerDavid Robillard <d@drobilla.net>2018-09-29 14:46:17 +0200
commita9116ca7e7913dd6cfb415df65e0e7cbc93b1f82 (patch)
tree9e04065f4e24101ff9af59f57543c9e45e38cdb9
parentf4ab1d3b31a04edaebde3ceb96e3708b151eca53 (diff)
downloadchilbert-a9116ca7e7913dd6cfb415df65e0e7cbc93b1f82.tar.gz
chilbert-a9116ca7e7913dd6cfb415df65e0e7cbc93b1f82.tar.bz2
chilbert-a9116ca7e7913dd6cfb415df65e0e7cbc93b1f82.zip
Remove superfluous return statements
-rw-r--r--chilbert/Algorithm.hpp22
-rw-r--r--chilbert/GrayCodeRank.hpp8
2 files changed, 0 insertions, 30 deletions
diff --git a/chilbert/Algorithm.hpp b/chilbert/Algorithm.hpp
index 99adc9d..9f44e3a 100644
--- a/chilbert/Algorithm.hpp
+++ b/chilbert/Algorithm.hpp
@@ -67,7 +67,6 @@ transform(
{
a ^= e;
a.rotr( d, n );//#D d+1, n );
- return;
}
// Inverse 'transforms' a point.
@@ -83,7 +82,6 @@ transformInv(
{
a.rotl( d, n );//#D d+1, n );
a ^= e;
- return;
}
// Update for method 1 (GrayCodeInv in the loop)
@@ -111,8 +109,6 @@ update1(
if ( ! (w.rack() & 1) )
e.toggle( d == 0 ? n-1 : d-1 ); //#D d );
-
- return;
}
// Update for method 2 (GrayCodeInv out of loop)
@@ -137,8 +133,6 @@ update2(
if ( d >= n ) d -= n;
if ( d >= n ) d -= n;
assert( 0 <= d && d < n );
-
- return;
}
template <class P,class H,class I>
@@ -193,8 +187,6 @@ _coordsToIndex(
}
grayCodeInv(h);
-
- return;
}
// This is wrapper to the basic Hilbert curve index
@@ -219,8 +211,6 @@ coordsToIndex(
// Otherwise, they must be BigBitVecs.
else
_coordsToIndex<P,H,CBigBitVec>(p,m,n,h, CBigBitVec(n));
-
- return;
}
@@ -273,8 +263,6 @@ _indexToCoords(
// Update the entry point and direction.
update1<I>(l,t,w,n,e,d);
}
-
- return;
}
// This is wrapper to the basic Hilbert curve inverse
@@ -300,8 +288,6 @@ indexToCoords(
// Otherwise, they must be BigBitVecs.
else
_indexToCoords<P,H,CBigBitVec>(p,m,n,h,CBigBitVec(n));
-
- return;
}
template <class P,class HC,class I>
@@ -353,8 +339,6 @@ _coordsToCompactIndex(
}
delete [] ds;
-
- return;
}
// This is wrapper to the basic Hilbert curve index
@@ -381,8 +365,6 @@ coordsToCompactIndex(
// Otherwise, they must be BigBitVecs.
else
_coordsToCompactIndex<P,HC,CBigBitVec>(p,ms,n,hc,CBigBitVec(n),M,m);
-
- return;
}
template <class P,class HC,class I>
@@ -456,8 +438,6 @@ _compactIndexToCoords(
// Update the entry point and direction.
update1<I>(l,t,w,n,e,d);
}
-
- return;
}
// This is wrapper to the basic Hilbert curve inverse
@@ -488,8 +468,6 @@ compactIndexToCoords(
CBigBitVec scratch(n);
_compactIndexToCoords<P,HC,CBigBitVec>(p,ms,n,hc,std::move(scratch),M,m);
}
-
- return;
}
}
diff --git a/chilbert/GrayCodeRank.hpp b/chilbert/GrayCodeRank.hpp
index b067ce2..cff8dfc 100644
--- a/chilbert/GrayCodeRank.hpp
+++ b/chilbert/GrayCodeRank.hpp
@@ -69,8 +69,6 @@ namespace chilbert
}
while ( j != ds[i] );
}
-
- return;
}
template<class I>
@@ -100,8 +98,6 @@ namespace chilbert
im<<=1; if ( im == 0 ) { im = 1; ++ir; }
}
-
- return;
}
@@ -158,8 +154,6 @@ namespace chilbert
im>>=1; if ( im == 0 ) { im=((FBV_UINT)1)<<(FBV_BITS-1); --ir; }
}
-
- return;
}
@@ -196,8 +190,6 @@ namespace chilbert
if ( ++j == n ) j = 0;
}
while ( j != d );
-
- return;
}
}