diff options
| author | Ulrich Bauer <mail@ulrich-bauer.org> | 2017-01-04 23:18:36 +0100 |
|---|---|---|
| committer | Ulrich Bauer <mail@ulrich-bauer.org> | 2017-01-04 23:18:36 +0100 |
| commit | b9c0af75e3b570cd09634b96373da5828eefef9d (patch) | |
| tree | a7c3e1d07fbaad941c6e04d9e8d4a8fac8ae44d2 /include/phat/helpers/misc.h | |
| parent | bb5407b3dfc05cdfef6d4260c81750926d882843 (diff) | |
| parent | ed83287e4221c37916097f64b6f93e06c2c8bbbe (diff) | |
Merge branch 'master' into python-pr
# Conflicts:
# README.md
Diffstat (limited to 'include/phat/helpers/misc.h')
| -rw-r--r-- | include/phat/helpers/misc.h | 2 |
1 files changed, 1 insertions, 1 deletions
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
|