Skip to content

Commit ae0de54

Browse files
jsquyresjsquyres
committed
Merge pull request #774 from jsquyres/pr/FUNCTION-fixes
__FUNCTION__ --> __func__ fixes
2 parents 6265aaa + 5065978 commit ae0de54

File tree

9 files changed

+24
-18
lines changed

9 files changed

+24
-18
lines changed

‎ompi/mca/coll/libnbc/libdict/dict_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ typedef int (*icompare_func) __P((void *, void *itor2));
4747
# define ASSERT(expr) \
4848
if (!(expr)) \
4949
fprintf(stderr, "\n%s:%d (%s) assertion failed: `%s'\n", \
50-
__FILE__, __LINE__, __PRETTY_FUNCTION__, #expr), \
50+
__FILE__, __LINE__, __func__, #expr), \
5151
abort()
5252
# else
5353
# define ASSERT(expr) \

‎ompi/mca/topo/treematch/treematch/tm_bucket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ void partial_update_val (int nb_args, void **args){
514514

515515
if(nb_args != 6){
516516
if(verbose_level >= ERROR)
517-
fprintf(stderr,"Wrong number of args in %s: %d\n",__FUNCTION__, nb_args);
517+
fprintf(stderr,"Wrong number of args in %s: %d\n",__func__, nb_args);
518518
exit(-1);
519519
}
520520

‎ompi/mca/topo/treematch/treematch/tm_tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ void partial_aggregate_aff_mat (int nb_args, void **args){
239239

240240
if(nb_args != 6){
241241
if(verbose_level >= ERROR)
242-
fprintf(stderr,"Wrong number of args in %s: %d\n",__FUNCTION__, nb_args);
242+
fprintf(stderr,"Wrong number of args in %s: %d\n",__func__, nb_args);
243243
exit(-1);
244244
}
245245

‎oshmem/mca/atomic/base/base.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -42,14 +43,14 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_atomic_base_framework;
4243
#ifdef OPAL_ENABLE_DEBUG
4344
#define ATOMIC_VERBOSE(level, ...) \
4445
oshmem_output_verbose(level, oshmem_atomic_base_framework.framework_output, \
45-
"%s:%d - %s()", __ATOMIC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
46+
"%s:%d - %s()", __ATOMIC_FILE__, __LINE__, __func__, __VA_ARGS__)
4647
#else
4748
#define ATOMIC_VERBOSE(level, ...)
4849
#endif
4950

5051
#define ATOMIC_ERROR(...) \
5152
oshmem_output(oshmem_atomic_base_framework.framework_output, \
52-
"Error %s:%d - %s()", __ATOMIC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
53+
"Error %s:%d - %s()", __ATOMIC_FILE__, __LINE__, __func__, __VA_ARGS__)
5354

5455
END_C_DECLS
5556

‎oshmem/mca/memheap/base/base.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -133,18 +134,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_memheap_base_framework;
133134
#ifdef OPAL_ENABLE_DEBUG
134135
#define MEMHEAP_VERBOSE(level, ...) \
135136
oshmem_output_verbose(level, oshmem_memheap_base_framework.framework_output, \
136-
"%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
137+
"%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
137138
#else
138139
#define MEMHEAP_VERBOSE(level, ...)
139140
#endif
140141

141142
#define MEMHEAP_ERROR(...) \
142143
oshmem_output(oshmem_memheap_base_framework.framework_output, \
143-
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
144+
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
144145

145146
#define MEMHEAP_WARN(...) \
146147
oshmem_output_verbose(0, oshmem_memheap_base_framework.framework_output, \
147-
"Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
148+
"Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
148149

149150
END_C_DECLS
150151

‎oshmem/mca/scoll/base/base.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -54,14 +55,14 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_scoll_base_framework;
5455
#ifdef OPAL_ENABLE_DEBUG
5556
#define SCOLL_VERBOSE(level, ...) \
5657
oshmem_output_verbose(level, oshmem_scoll_base_framework.framework_output, \
57-
"%s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
58+
"%s:%d - %s()", __SCOLL_FILE__, __LINE__, __func__, __VA_ARGS__)
5859
#else
5960
#define SCOLL_VERBOSE(...)
6061
#endif
6162

6263
#define SCOLL_ERROR(...) \
6364
oshmem_output(oshmem_scoll_base_framework.framework_output, \
64-
"Error %s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
65+
"Error %s:%d - %s()", __SCOLL_FILE__, __LINE__, __func__, __VA_ARGS__)
6566

6667
END_C_DECLS
6768

‎oshmem/mca/spml/base/base.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -83,18 +84,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_spml_base_framework;
8384
#ifdef OPAL_ENABLE_DEBUG
8485
#define SPML_VERBOSE(level, ...) \
8586
oshmem_output_verbose(level, oshmem_spml_base_framework.framework_output, \
86-
"%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
87+
"%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
8788
#else
8889
#define SPML_VERBOSE(level, ...)
8990
#endif
9091

9192
#define SPML_ERROR(...) \
9293
oshmem_output(oshmem_spml_base_framework.framework_output, \
93-
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
94+
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
9495

9596
#define SPML_WARNING(...) \
9697
oshmem_output_verbose(0, oshmem_spml_base_framework.framework_output, \
97-
"Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
98+
"Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
9899

99100
END_C_DECLS
100101

‎oshmem/mca/sshmem/base/base.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
* Copyright (c) 2014 Mellanox Technologies, Inc.
33
* All rights reserved.
4+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -133,18 +134,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_sshmem_base_framework;
133134
#if OPAL_ENABLE_DEBUG
134135
#define SSHMEM_VERBOSE(level, ...) \
135136
oshmem_output_verbose(level, oshmem_sshmem_base_framework.framework_output, \
136-
"%s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
137+
"%s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__)
137138
#else
138139
#define SSHMEM_VERBOSE(level, ...)
139140
#endif
140141

141142
#define SSHMEM_ERROR(...) \
142143
oshmem_output(oshmem_sshmem_base_framework.framework_output, \
143-
"Error %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
144+
"Error %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__)
144145

145146
#define SSHMEM_WARN(...) \
146147
oshmem_output_verbose(0, oshmem_sshmem_base_framework.framework_output, \
147-
"Warning %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
148+
"Warning %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__)
148149

149150

150151
/*

‎oshmem/shmem/shmem_api_logger.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4+
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
45
* $COPYRIGHT$
56
*
67
* Additional copyrights may follow
@@ -29,13 +30,13 @@ OSHMEM_DECLSPEC extern int shmem_api_logger_output;
2930
#ifdef OPAL_ENABLE_DEBUG
3031
#define SHMEM_API_VERBOSE(level, ...) \
3132
oshmem_output_verbose(level, shmem_api_logger_output, \
32-
"%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
33+
"%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
3334
#else
3435
#define SHMEM_API_VERBOSE(level, ...)
3536
#endif
3637

3738
#define SHMEM_API_ERROR(...) \
3839
oshmem_output(shmem_api_logger_output, \
39-
"Error: %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
40+
"Error: %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
4041

4142
#endif /*SHMEM_API_LOGGER_H*/

0 commit comments

Comments
 (0)