From 57c0f073ec38351aa659693cc16f6e3ab4ec28da Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 28 Mar 2017 11:08:41 +0200 Subject: compat, options: remove explicit template instantiation It breaks on GNU and saves little space. --- compat/simple-mat.hpp | 15 --------------- options/value.hpp | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/compat/simple-mat.hpp b/compat/simple-mat.hpp index 186043c0..fbd0a75e 100644 --- a/compat/simple-mat.hpp +++ b/compat/simple-mat.hpp @@ -273,18 +273,3 @@ Mat operator*(const Mat& self, num other) ret(j, i) = self(j, i) * other; return ret; } - -#ifdef OTR_SIMPLE_MAT_TEMPLATE_UNIT -# define OTR_SIMPLE_MAT_TEMPLATE_EXTERN -# define OTR_SIMPLE_MAT_TEMPLATE_DECLSPEC OPENTRACK_COMPAT_EXPORT -#else -# define OTR_SIMPLE_MAT_TEMPLATE_EXTERN extern -# define OTR_SIMPLE_MAT_TEMPLATE_DECLSPEC -#endif - -OTR_SIMPLE_MAT_TEMPLATE_EXTERN template class OTR_SIMPLE_MAT_TEMPLATE_DECLSPEC Mat; -OTR_SIMPLE_MAT_TEMPLATE_EXTERN template class OTR_SIMPLE_MAT_TEMPLATE_DECLSPEC Mat; -OTR_SIMPLE_MAT_TEMPLATE_EXTERN template class OTR_SIMPLE_MAT_TEMPLATE_DECLSPEC Mat; -OTR_SIMPLE_MAT_TEMPLATE_EXTERN template class OTR_SIMPLE_MAT_TEMPLATE_DECLSPEC Mat; -OTR_SIMPLE_MAT_TEMPLATE_EXTERN template class OTR_SIMPLE_MAT_TEMPLATE_DECLSPEC Mat; - diff --git a/options/value.hpp b/options/value.hpp index 83529262..4904c370 100644 --- a/options/value.hpp +++ b/options/value.hpp @@ -225,19 +225,4 @@ private: const t def; }; -#ifdef OTR_OPTIONS_VALUE_TEMPLATE_UNIT -# define OTR_OPTIONS_VALUE_TEMPLATE_EXTERN -# define OTR_OPTIONS_VALUE_TEMPLATE_DECLSPEC OPENTRACK_OPTIONS_EXPORT -#else -# define OTR_OPTIONS_VALUE_TEMPLATE_EXTERN extern -# define OTR_OPTIONS_VALUE_TEMPLATE_DECLSPEC -#endif - -OTR_OPTIONS_VALUE_TEMPLATE_EXTERN template class OTR_OPTIONS_VALUE_TEMPLATE_DECLSPEC value; -OTR_OPTIONS_VALUE_TEMPLATE_EXTERN template class OTR_OPTIONS_VALUE_TEMPLATE_DECLSPEC value; -OTR_OPTIONS_VALUE_TEMPLATE_EXTERN template class OTR_OPTIONS_VALUE_TEMPLATE_DECLSPEC value; -OTR_OPTIONS_VALUE_TEMPLATE_EXTERN template class OTR_OPTIONS_VALUE_TEMPLATE_DECLSPEC value; -OTR_OPTIONS_VALUE_TEMPLATE_EXTERN template class OTR_OPTIONS_VALUE_TEMPLATE_DECLSPEC value; -OTR_OPTIONS_VALUE_TEMPLATE_EXTERN template class OTR_OPTIONS_VALUE_TEMPLATE_DECLSPEC value>; - } // ns options -- cgit v1.2.3