diff options
author | Sergey Sharybin <sergey@blender.org> | 2022-03-25 12:57:13 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2022-03-25 12:57:13 +0300 |
commit | 484af996aa75750c8b419a25b68c9eb8d7efcf19 (patch) | |
tree | 4e82ec9dead85650ddfae3718a369ea8cd9d54c0 /source/blender/makesdna/intern | |
parent | 8c44793228750537c08ea7b19fc18df0138f9501 (diff) |
Revert "Implement C++ methods for DNA structures"
This reverts commit 8c44793228750537c08ea7b19fc18df0138f9501.
Apparently, this generated a lot of warnings in GCC.
Didn't find a quick solution and is it not something I want to be
trading between (more quiet Clang in an expense of less quiet GCC).
Will re-iterate on the patch are re-commit it.
Diffstat (limited to 'source/blender/makesdna/intern')
-rw-r--r-- | source/blender/makesdna/intern/dna_utils.c | 12 | ||||
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 12 |
2 files changed, 0 insertions, 24 deletions
diff --git a/source/blender/makesdna/intern/dna_utils.c b/source/blender/makesdna/intern/dna_utils.c index 560b91b925e..8c86ef69ebd 100644 --- a/source/blender/makesdna/intern/dna_utils.c +++ b/source/blender/makesdna/intern/dna_utils.c @@ -308,15 +308,3 @@ const char *DNA_struct_rename_legacy_hack_alias_from_static(const char *name) } /** \} */ - -/* -------------------------------------------------------------------- */ -/** \name Internal helpers for C++ - * \{ */ - -void _DNA_internal_memcpy(void *dst, const void *src, size_t size); -void _DNA_internal_memcpy(void *dst, const void *src, const size_t size) -{ - memcpy(dst, src, size); -} - -/** \} */ diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 12ec7262906..0d2f265a9b5 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -620,7 +620,6 @@ static int preprocess_include(char *maindata, const int maindata_len) int newlen = 0; comment = 0; a = maindata_len; - bool skip_until_closing_brace = false; while (a--) { if (cp[0] == '/' && cp[1] == '*') { @@ -647,17 +646,6 @@ static int preprocess_include(char *maindata, const int maindata_len) a -= 13; cp += 13; } - else if (match_identifier(cp, "DNA_DEFINE_CXX_METHODS")) { - /* single values are skipped already, so decrement 1 less */ - a -= 21; - cp += 21; - skip_until_closing_brace = true; - } - else if (skip_until_closing_brace) { - if (cp[0] == ')') { - skip_until_closing_brace = false; - } - } else { md[0] = cp[0]; md++; |