From a4c1b443710c6208fb0b29ca4f56899fc75714f1 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Mon, 19 Mar 2018 21:20:10 -0600 Subject: [PATCH] dtoolbase: Remove EXPORT_TEMPLATES define As of f69354d9fa603ac05dfd924af3844f749fd50cdd, this is just always expected on all platforms. If it's not defined, TemplateClass::_type_handle won't link correctly with some compilers (e.g. Clang) and the lack of 'extern template class' will result in duplicated code in any case. In short, turning it off causes problems. makepanda also always turns this on, so it doesn't represent any optional feature or autodetected platform-specific behavior anyway. --- dtool/src/dtoolbase/dtoolbase_cc.h | 2 +- makepanda/makepanda.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dtool/src/dtoolbase/dtoolbase_cc.h b/dtool/src/dtoolbase/dtoolbase_cc.h index eb84f1fccd..dee66e04da 100644 --- a/dtool/src/dtoolbase/dtoolbase_cc.h +++ b/dtool/src/dtoolbase/dtoolbase_cc.h @@ -257,7 +257,7 @@ template typename remove_reference::type &&move(T &&t) { #endif -#if !defined(LINK_ALL_STATIC) && defined(EXPORT_TEMPLATES) +#ifndef LINK_ALL_STATIC // This macro must be used to export an instantiated template class from a // DLL. If the template class name itself contains commas, it may be // necessary to first define a macro for the class name, to allow proper macro diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 1c8c95724d..59633ea892 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2253,7 +2253,6 @@ DTOOL_CONFIG=[ ("SUPPORT_FIXED_FUNCTION", '1', '1'), ("DO_MEMORY_USAGE", 'UNDEF', 'UNDEF'), ("DO_PIPELINING", '1', '1'), - ("EXPORT_TEMPLATES", 'yes', 'yes'), ("DEFAULT_PATHSEP", '";"', '":"'), ("WORDS_BIGENDIAN", 'UNDEF', 'UNDEF'), ("HAVE_NAMESPACE", '1', '1'),