bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

MSVC: remove compiler __func__ define

Browse Source 
No longer needed and exposes a bug in clang-format see: D4185
This commit is contained in:
Campbell Barton 2019-01-11 09:22:21 +11:00
parent 8b192e1a6a
commit 302970b7a5
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/clog/CLG_log.h
View File

@ -90,11 +90,6 @@ extern "C" {
# define _CLOG_ATTR_PRINTF_FORMAT(format_param, dots_param) # define _CLOG_ATTR_PRINTF_FORMAT(format_param, dots_param)
#endif #endif
#if defined(_MSC_VER) && !defined(__func__)
# define __func__MSVC
# define __func__ __FUNCTION__
#endif
#define STRINGIFY_ARG(x) "" #x #define STRINGIFY_ARG(x) "" #x
#define STRINGIFY_APPEND(a, b) "" a #b #define STRINGIFY_APPEND(a, b) "" a #b
#define STRINGIFY(x) STRINGIFY_APPEND("", x) #define STRINGIFY(x) STRINGIFY_APPEND("", x)
@ -203,10 +198,6 @@ void CLG_logref_init(CLG_LogRef *clg_ref);
#define CLOG_STR_ERROR_N(clg_ref, ...) CLOG_STR_AT_SEVERITY_N(clg_ref, CLG_SEVERITY_ERROR, 0, __VA_ARGS__) #define CLOG_STR_ERROR_N(clg_ref, ...) CLOG_STR_AT_SEVERITY_N(clg_ref, CLG_SEVERITY_ERROR, 0, __VA_ARGS__)
#define CLOG_STR_FATAL_N(clg_ref, ...) CLOG_STR_AT_SEVERITY_N(clg_ref, CLG_SEVERITY_FATAL, 0, __VA_ARGS__) #define CLOG_STR_FATAL_N(clg_ref, ...) CLOG_STR_AT_SEVERITY_N(clg_ref, CLG_SEVERITY_FATAL, 0, __VA_ARGS__)
#ifdef __func__MSVC
# undef __func__MSVC
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

4
intern/guardedalloc/intern/mallocn_intern.h
View File

@ -39,10 +39,6 @@
# include <sys/mman.h> # include <sys/mman.h>
#endif #endif
#if defined(_MSC_VER)
# define __func__ __FUNCTION__
#endif
#ifdef __GNUC__ #ifdef __GNUC__
# define UNUSED(x) UNUSED_ ## x __attribute__((__unused__)) # define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
#else #else

1
source/blender/blenlib/BLI_compiler_compat.h
View File

@ -28,7 +28,6 @@
*/ */
#if defined(_MSC_VER) #if defined(_MSC_VER)
# define __func__ __FUNCTION__
# define alloca _alloca # define alloca _alloca
#endif #endif

4
source/blender/datatoc/datatoc_icon.c
View File

@ -50,10 +50,6 @@
# define SEP '/' # define SEP '/'
#endif #endif
#if defined(_MSC_VER)
# define __func__ __FUNCTION__
#endif
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Utility functions */ /* Utility functions */