From 8bc45503596581cde93007016e0d57acba67a908 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Fri, 16 Apr 2021 08:56:33 -0700 Subject: [PATCH] Remove unnecessary dllexport --- include/fmt/core.h | 3 --- include/fmt/format.h | 2 +- src/format.cc | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/fmt/core.h b/include/fmt/core.h index 4145bd9e9ed0..2f12af687a69 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -223,9 +223,6 @@ #ifndef FMT_EXTERN_TEMPLATE_API # define FMT_EXTERN_TEMPLATE_API #endif -#ifndef FMT_INSTANTIATION_DECL_API -# define FMT_INSTANTIATION_DECL_API FMT_API -#endif #ifndef FMT_HEADER_ONLY # define FMT_EXTERN extern diff --git a/include/fmt/format.h b/include/fmt/format.h index ee01391c98cd..05066fad62c1 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -995,7 +995,7 @@ FMT_INLINE uint16_t bsr2log10(int bsr) { return data[bsr]; } -FMT_EXTERN template struct FMT_INSTANTIATION_DECL_API basic_data; +FMT_EXTERN template struct basic_data; // This is a struct rather than an alias to avoid shadowing warnings in gcc. struct data : basic_data<> {}; diff --git a/src/format.cc b/src/format.cc index 54f4ad4552fd..22fda622fdf6 100644 --- a/src/format.cc +++ b/src/format.cc @@ -55,8 +55,6 @@ vformat_to(buffer&, string_view, type_identity_t>>); } // namespace detail -// Clang doesn't allow dllexport on template instantiation definitions: -// https://reviews.llvm.org/D61118. template struct detail::basic_data; // Workaround a bug in MSVC2013 that prevents instantiation of format_float.