From f17ae4a5e9dd2163fc33137d99ade488fe8c934a Mon Sep 17 00:00:00 2001 From: Victor Lopez Date: Tue, 15 May 2018 09:51:10 +0200 Subject: [PATCH] Fix nanos_omp_set_num_threads return type gcc-8 requires an alias function to have the same exact return type --- src/pms/openmp/nanos_omp.h | 2 +- src/pms/openmp/omp_api.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pms/openmp/nanos_omp.h b/src/pms/openmp/nanos_omp.h index 57966204a..122af9947 100644 --- a/src/pms/openmp/nanos_omp.h +++ b/src/pms/openmp/nanos_omp.h @@ -45,7 +45,7 @@ NANOS_API_DECL(nanos_err_t, nanos_omp_set_implicit, ( nanos_wd_t uwd )); NANOS_API_DECL(int, nanos_omp_get_max_threads, ( void )); NANOS_API_DECL(int, nanos_omp_get_num_threads, ( void )); NANOS_API_DECL(int, nanos_omp_get_thread_num, ( void )); -NANOS_API_DECL(int, nanos_omp_set_num_threads, ( int nthreads )); +NANOS_API_DECL(void, nanos_omp_set_num_threads, ( int nthreads )); NANOS_API_DECL(nanos_ws_t, nanos_omp_find_worksharing, ( nanos_omp_sched_t kind )); NANOS_API_DECL(nanos_err_t, nanos_omp_get_schedule, ( nanos_omp_sched_t *kind, int *modifier )); diff --git a/src/pms/openmp/omp_api.cpp b/src/pms/openmp/omp_api.cpp index 40dbee6d5..c401ad893 100644 --- a/src/pms/openmp/omp_api.cpp +++ b/src/pms/openmp/omp_api.cpp @@ -56,8 +56,8 @@ extern "C" omp_set_num_threads(*nthreads); } - int nanos_omp_set_num_threads ( int nthreads ) __attribute__ ((alias ("omp_set_num_threads"))); - int nanos_omp_set_num_threads_ ( int nthreads ) __attribute__ ((alias ("omp_set_num_threads"))); + void nanos_omp_set_num_threads ( int nthreads ) __attribute__ ((alias ("omp_set_num_threads"))); + void nanos_omp_set_num_threads_ ( int nthreads ) __attribute__ ((alias ("omp_set_num_threads"))); NANOS_API_DEF(int, omp_get_thread_num, ( void )) { -- GitLab