aboutsummaryrefslogtreecommitdiffstats
path: root/Hilbert/Algorithm.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'Hilbert/Algorithm.hpp')
-rw-r--r--Hilbert/Algorithm.hpp25
1 files changed, 12 insertions, 13 deletions
diff --git a/Hilbert/Algorithm.hpp b/Hilbert/Algorithm.hpp
index b22fc5e..c79f700 100644
--- a/Hilbert/Algorithm.hpp
+++ b/Hilbert/Algorithm.hpp
@@ -20,7 +20,6 @@
#define _ALGORITHM_HPP_
-#include <Hilbert/Common.hpp>
#include <Hilbert/BigBitVec.hpp>
#include <Hilbert/GetLocation.hpp>
#include <Hilbert/SetLocation.hpp>
@@ -56,7 +55,7 @@ namespace Hilbert
{
// 'Transforms' a point.
template<class I>
- H_INLINE
+ inline
void
transform(
const I &e,
@@ -72,7 +71,7 @@ namespace Hilbert
// Inverse 'transforms' a point.
template<class I>
- H_INLINE
+ inline
void
transformInv(
const I &e,
@@ -88,7 +87,7 @@ namespace Hilbert
// Update for method 1 (GrayCodeInv in the loop)
template<class I>
- H_INLINE
+ inline
void
update1(
const I &l,
@@ -117,7 +116,7 @@ namespace Hilbert
// Update for method 2 (GrayCodeInv out of loop)
template<class I>
- H_INLINE
+ inline
void
update2(
const I &l,
@@ -142,7 +141,7 @@ namespace Hilbert
}
template <class P,class H,class I>
- H_INLINE
+ inline
void
_coordsToIndex(
const P *p,
@@ -200,7 +199,7 @@ namespace Hilbert
// representation for interim variables.
// Assumes h is big enough for the output (n*m bits!)
template<class P,class H>
- H_INLINE
+ inline
void
coordsToIndex(
const P *p, // [in ] point
@@ -221,7 +220,7 @@ namespace Hilbert
template <class P,class H,class I>
- H_INLINE
+ inline
void
_indexToCoords(
P *p,
@@ -277,7 +276,7 @@ namespace Hilbert
// Assumes each entry of p is big enough to hold the
// appropriate variable.
template<class P,class H>
- H_INLINE
+ inline
void
indexToCoords(
P *p, // [out] point
@@ -297,7 +296,7 @@ namespace Hilbert
}
template <class P,class HC,class I>
- H_INLINE
+ inline
void
_coordsToCompactIndex(
const P *p,
@@ -355,7 +354,7 @@ namespace Hilbert
// representation for interim variables.
// Assumes h is big enough for the output (n*m bits!)
template<class P,class HC>
- H_INLINE
+ inline
void
coordsToCompactIndex(
const P *p, // [in ] point
@@ -377,7 +376,7 @@ namespace Hilbert
}
template <class P,class HC,class I>
- H_INLINE
+ inline
void
_compactIndexToCoords(
P *p,
@@ -451,7 +450,7 @@ namespace Hilbert
// Assumes each entry of p is big enough to hold the
// appropriate variable.
template<class P,class HC>
- H_INLINE
+ inline
void
compactIndexToCoords(
P *p, // [out] point