From a0ebbee6efa4c0bb3490baba4b15ac99b169dc02 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 5 Aug 2015 05:27:23 -0700 Subject: [PATCH 1/3] libnbc: __FUNCTION__ -> __func__ fixes --- ompi/mca/coll/libnbc/libdict/dict_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mca/coll/libnbc/libdict/dict_private.h b/ompi/mca/coll/libnbc/libdict/dict_private.h index 5939182e19..da2b6dbdea 100644 --- a/ompi/mca/coll/libnbc/libdict/dict_private.h +++ b/ompi/mca/coll/libnbc/libdict/dict_private.h @@ -47,7 +47,7 @@ typedef int (*icompare_func) __P((void *, void *itor2)); # define ASSERT(expr) \ if (!(expr)) \ fprintf(stderr, "\n%s:%d (%s) assertion failed: `%s'\n", \ - __FILE__, __LINE__, __PRETTY_FUNCTION__, #expr), \ + __FILE__, __LINE__, __func__, #expr), \ abort() # else # define ASSERT(expr) \ From a36d7e60265888d46bfcf33351ab23005b8736bd Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 5 Aug 2015 05:27:46 -0700 Subject: [PATCH 2/3] treematch: __FUNCTION__ -> __func__ fixes --- ompi/mca/topo/treematch/treematch/tm_bucket.c | 2 +- ompi/mca/topo/treematch/treematch/tm_tree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/mca/topo/treematch/treematch/tm_bucket.c b/ompi/mca/topo/treematch/treematch/tm_bucket.c index 44d0169bce..ee50b39c69 100644 --- a/ompi/mca/topo/treematch/treematch/tm_bucket.c +++ b/ompi/mca/topo/treematch/treematch/tm_bucket.c @@ -514,7 +514,7 @@ void partial_update_val (int nb_args, void **args){ if(nb_args != 6){ if(verbose_level >= ERROR) - fprintf(stderr,"Wrong number of args in %s: %d\n",__FUNCTION__, nb_args); + fprintf(stderr,"Wrong number of args in %s: %d\n",__func__, nb_args); exit(-1); } diff --git a/ompi/mca/topo/treematch/treematch/tm_tree.c b/ompi/mca/topo/treematch/treematch/tm_tree.c index 0d39a8e3b2..ab52e0f30f 100644 --- a/ompi/mca/topo/treematch/treematch/tm_tree.c +++ b/ompi/mca/topo/treematch/treematch/tm_tree.c @@ -239,7 +239,7 @@ void partial_aggregate_aff_mat (int nb_args, void **args){ if(nb_args != 6){ if(verbose_level >= ERROR) - fprintf(stderr,"Wrong number of args in %s: %d\n",__FUNCTION__, nb_args); + fprintf(stderr,"Wrong number of args in %s: %d\n",__func__, nb_args); exit(-1); } From 5065978a1e12762552e08bbce8230e6c0155db23 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 5 Aug 2015 05:27:54 -0700 Subject: [PATCH 3/3] oshmem: __FUNCTION__ -> __func__ fixes --- oshmem/mca/atomic/base/base.h | 5 +++-- oshmem/mca/memheap/base/base.h | 7 ++++--- oshmem/mca/scoll/base/base.h | 5 +++-- oshmem/mca/spml/base/base.h | 7 ++++--- oshmem/mca/sshmem/base/base.h | 7 ++++--- oshmem/shmem/shmem_api_logger.h | 5 +++-- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/oshmem/mca/atomic/base/base.h b/oshmem/mca/atomic/base/base.h index c8ab1fa37e..e8fe9833bb 100644 --- a/oshmem/mca/atomic/base/base.h +++ b/oshmem/mca/atomic/base/base.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -42,14 +43,14 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_atomic_base_framework; #ifdef OPAL_ENABLE_DEBUG #define ATOMIC_VERBOSE(level, ...) \ oshmem_output_verbose(level, oshmem_atomic_base_framework.framework_output, \ - "%s:%d - %s()", __ATOMIC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "%s:%d - %s()", __ATOMIC_FILE__, __LINE__, __func__, __VA_ARGS__) #else #define ATOMIC_VERBOSE(level, ...) #endif #define ATOMIC_ERROR(...) \ oshmem_output(oshmem_atomic_base_framework.framework_output, \ - "Error %s:%d - %s()", __ATOMIC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Error %s:%d - %s()", __ATOMIC_FILE__, __LINE__, __func__, __VA_ARGS__) END_C_DECLS diff --git a/oshmem/mca/memheap/base/base.h b/oshmem/mca/memheap/base/base.h index 2464173473..1a9cbad5ef 100644 --- a/oshmem/mca/memheap/base/base.h +++ b/oshmem/mca/memheap/base/base.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -133,18 +134,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_memheap_base_framework; #ifdef OPAL_ENABLE_DEBUG #define MEMHEAP_VERBOSE(level, ...) \ oshmem_output_verbose(level, oshmem_memheap_base_framework.framework_output, \ - "%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__) #else #define MEMHEAP_VERBOSE(level, ...) #endif #define MEMHEAP_ERROR(...) \ oshmem_output(oshmem_memheap_base_framework.framework_output, \ - "Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Error %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__) #define MEMHEAP_WARN(...) \ oshmem_output_verbose(0, oshmem_memheap_base_framework.framework_output, \ - "Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__) END_C_DECLS diff --git a/oshmem/mca/scoll/base/base.h b/oshmem/mca/scoll/base/base.h index 0757d5a355..08af8e197b 100644 --- a/oshmem/mca/scoll/base/base.h +++ b/oshmem/mca/scoll/base/base.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -54,14 +55,14 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_scoll_base_framework; #ifdef OPAL_ENABLE_DEBUG #define SCOLL_VERBOSE(level, ...) \ oshmem_output_verbose(level, oshmem_scoll_base_framework.framework_output, \ - "%s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "%s:%d - %s()", __SCOLL_FILE__, __LINE__, __func__, __VA_ARGS__) #else #define SCOLL_VERBOSE(...) #endif #define SCOLL_ERROR(...) \ oshmem_output(oshmem_scoll_base_framework.framework_output, \ - "Error %s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Error %s:%d - %s()", __SCOLL_FILE__, __LINE__, __func__, __VA_ARGS__) END_C_DECLS diff --git a/oshmem/mca/spml/base/base.h b/oshmem/mca/spml/base/base.h index 3552644ec8..8617c1dfbf 100644 --- a/oshmem/mca/spml/base/base.h +++ b/oshmem/mca/spml/base/base.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -83,18 +84,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_spml_base_framework; #ifdef OPAL_ENABLE_DEBUG #define SPML_VERBOSE(level, ...) \ oshmem_output_verbose(level, oshmem_spml_base_framework.framework_output, \ - "%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__) #else #define SPML_VERBOSE(level, ...) #endif #define SPML_ERROR(...) \ oshmem_output(oshmem_spml_base_framework.framework_output, \ - "Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Error %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__) #define SPML_WARNING(...) \ oshmem_output_verbose(0, oshmem_spml_base_framework.framework_output, \ - "Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__) END_C_DECLS diff --git a/oshmem/mca/sshmem/base/base.h b/oshmem/mca/sshmem/base/base.h index 513f3596ba..27c86014fd 100644 --- a/oshmem/mca/sshmem/base/base.h +++ b/oshmem/mca/sshmem/base/base.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2014 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -133,18 +134,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_sshmem_base_framework; #if OPAL_ENABLE_DEBUG #define SSHMEM_VERBOSE(level, ...) \ oshmem_output_verbose(level, oshmem_sshmem_base_framework.framework_output, \ - "%s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "%s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__) #else #define SSHMEM_VERBOSE(level, ...) #endif #define SSHMEM_ERROR(...) \ oshmem_output(oshmem_sshmem_base_framework.framework_output, \ - "Error %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Error %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__) #define SSHMEM_WARN(...) \ oshmem_output_verbose(0, oshmem_sshmem_base_framework.framework_output, \ - "Warning %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Warning %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__) /* diff --git a/oshmem/shmem/shmem_api_logger.h b/oshmem/shmem/shmem_api_logger.h index 6fda16d886..af7df50fe7 100644 --- a/oshmem/shmem/shmem_api_logger.h +++ b/oshmem/shmem/shmem_api_logger.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. + * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -29,13 +30,13 @@ OSHMEM_DECLSPEC extern int shmem_api_logger_output; #ifdef OPAL_ENABLE_DEBUG #define SHMEM_API_VERBOSE(level, ...) \ oshmem_output_verbose(level, shmem_api_logger_output, \ - "%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__) #else #define SHMEM_API_VERBOSE(level, ...) #endif #define SHMEM_API_ERROR(...) \ oshmem_output(shmem_api_logger_output, \ - "Error: %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + "Error: %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__) #endif /*SHMEM_API_LOGGER_H*/