summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Bauer <mail@ulrich-bauer.org>2017-01-04 23:18:36 +0100
committerUlrich Bauer <mail@ulrich-bauer.org>2017-01-04 23:18:36 +0100
commitb9c0af75e3b570cd09634b96373da5828eefef9d (patch)
treea7c3e1d07fbaad941c6e04d9e8d4a8fac8ae44d2
parentbb5407b3dfc05cdfef6d4260c81750926d882843 (diff)
parented83287e4221c37916097f64b6f93e06c2c8bbbe (diff)
Merge branch 'master' into python-pr
# Conflicts: # README.md
-rw-r--r--include/phat/helpers/dualize.h2
-rw-r--r--include/phat/helpers/misc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/phat/helpers/dualize.h b/include/phat/helpers/dualize.h
index 3ffedf8..5731408 100644
--- a/include/phat/helpers/dualize.h
+++ b/include/phat/helpers/dualize.h
@@ -65,7 +65,7 @@ namespace phat {
boundary_matrix.load_vector_vector( dual_matrix, dual_dims );
}
- void dualize_persistence_pairs( persistence_pairs& pairs, const index n ) {
+ inline void dualize_persistence_pairs( persistence_pairs& pairs, const index n ) {
for (index i = 0; i < pairs.get_num_pairs(); ++i) {
std::pair< index, index > pair = pairs.get_pair( i );
pairs.set_pair( i , n - 1 - pair.second, n - 1 - pair.first);
diff --git a/include/phat/helpers/misc.h b/include/phat/helpers/misc.h
index fb5c07a..3e1ed56 100644
--- a/include/phat/helpers/misc.h
+++ b/include/phat/helpers/misc.h
@@ -64,7 +64,7 @@ namespace phat {
#define omp_get_thread_num() 0
#define omp_get_max_threads() 1
#define omp_get_num_threads() 1
- void omp_set_num_threads( int ) {};
+ inline void omp_set_num_threads( int ) {};
#include <time.h>
#define omp_get_wtime() (float)clock() / (float)CLOCKS_PER_SEC
#endif