Merge remote-tracking branch 'upstream/master' into fuzz

pauldreik · May 4, 2019 · ff17322 · ff17322
2 parents d6a5985 + 29c10fb
commit ff17322
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/include/fmt/core.h b/include/fmt/core.h
@@ -189,11 +189,21 @@
 #    define FMT_API __declspec(dllexport)
 #  elif defined(FMT_SHARED)
 #    define FMT_API __declspec(dllimport)
+#    define FMT_EXTERN_TEMPLATE_API FMT_API
 #  endif
 #endif
 #ifndef FMT_API
 #  define FMT_API
 #endif
+#ifndef FMT_EXTERN_TEMPLATE_API
+#  define FMT_EXTERN_TEMPLATE_API
+#endif
+
+#ifndef FMT_HEADER_ONLY
+#  define FMT_EXTERN extern
+#else
+#  define FMT_EXTERN
+#endif
 
 #ifndef FMT_ASSERT
 #  define FMT_ASSERT(condition, message) assert((condition) && message)

diff --git a/include/fmt/format.h b/include/fmt/format.h
@@ -159,16 +159,6 @@ FMT_END_NAMESPACE
 #  define FMT_UDL_TEMPLATE 0
 #endif
 
-#ifndef FMT_USE_EXTERN_TEMPLATES
-#  ifndef FMT_HEADER_ONLY
-#    define FMT_USE_EXTERN_TEMPLATES                           \
-      ((FMT_CLANG_VERSION >= 209 && __cplusplus >= 201103L) || \
-       (FMT_GCC_VERSION >= 303 && FMT_HAS_GXX_CXX11))
-#  else
-#    define FMT_USE_EXTERN_TEMPLATES 0
-#  endif
-#endif
-
 #if FMT_HAS_GXX_CXX11 || FMT_HAS_FEATURE(cxx_trailing_return) || \
     FMT_MSC_VER >= 1600
 #  define FMT_USE_TRAILING_RETURN 1
@@ -717,7 +707,7 @@ template <typename T> struct int_traits {
 
 // Static data is placed in this class template to allow header-only
 // configuration.
-template <typename T = void> struct FMT_API basic_data {
+template <typename T = void> struct FMT_EXTERN_TEMPLATE_API basic_data {
   static const uint64_t POWERS_OF_10_64[];
   static const uint32_t ZERO_OR_POWERS_OF_10_32[];
   static const uint64_t ZERO_OR_POWERS_OF_10_64[];
@@ -731,9 +721,7 @@ template <typename T = void> struct FMT_API basic_data {
   static const wchar_t WRESET_COLOR[5];
 };
 
-#if FMT_USE_EXTERN_TEMPLATES
-extern template struct basic_data<void>;
-#endif
+FMT_EXTERN template struct basic_data<void>;
 
 // This is a struct rather than a typedef to avoid shadowing warnings in gcc.
 struct data : basic_data<> {};

diff --git a/src/format.cc b/src/format.cc
@@ -8,7 +8,7 @@
 #include "fmt/format-inl.h"
 
 FMT_BEGIN_NAMESPACE
-template struct internal::basic_data<void>;
+template struct FMT_API internal::basic_data<void>;
 
 // Workaround a bug in MSVC2013 that prevents instantiation of grisu_format.
 bool (*instantiate_grisu_format)(double, internal::buffer<char>&, int, unsigned,