Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-01-11 01:22:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-11 01:22:21 +0300
commit302970b7a5e9b6510f58d786501542e162140d2e (patch)
tree7a190bc7325b25f41ad60c46bd515110f9ff853f /intern/clog
parent8b192e1a6a5f985087949591d75e5757589ee16a (diff)
MSVC: remove compiler __func__ define
No longer needed and exposes a bug in clang-format see: D4185
Diffstat (limited to 'intern/clog')
-rw-r--r--intern/clog/CLG_log.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/intern/clog/CLG_log.h b/intern/clog/CLG_log.h
index 390122289b1..79d0d874d52 100644
--- a/intern/clog/CLG_log.h
+++ b/intern/clog/CLG_log.h
@@ -90,11 +90,6 @@ extern "C" {
# define _CLOG_ATTR_PRINTF_FORMAT(format_param, dots_param)
#endif
-#if defined(_MSC_VER) && !defined(__func__)
-# define __func__MSVC
-# define __func__ __FUNCTION__
-#endif
-
#define STRINGIFY_ARG(x) "" #x
#define STRINGIFY_APPEND(a, b) "" a #b
#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_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
}
#endif