diff options
| -rw-r--r-- | host/include/uhd/config.hpp | 12 | ||||
| -rw-r--r-- | host/include/uhd/types/ranges.hpp | 6 | ||||
| -rw-r--r-- | host/include/uhd/types/ranges.ipp | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 316d60c2b..006086480 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -56,17 +56,17 @@ #define UHD_HELPER_DLL_IMPORT __declspec(dllimport) #define UHD_HELPER_DLL_EXPORT __declspec(dllexport) #define UHD_HELPER_DLL_LOCAL - #define UHD_HELPER_EXIMP_TMPL + #define UHD_HELPER_EXIM_TMPL #elif defined(__GNUG__) && __GNUG__ >= 4 #define UHD_HELPER_DLL_IMPORT __attribute__ ((visibility("default"))) #define UHD_HELPER_DLL_EXPORT __attribute__ ((visibility("default"))) #define UHD_HELPER_DLL_LOCAL __attribute__ ((visibility("hidden"))) - #define UHD_HELPER_EXIMP_TMPL extern + #define UHD_HELPER_EXIM_TMPL extern #else #define UHD_HELPER_DLL_IMPORT #define UHD_HELPER_DLL_EXPORT #define UHD_HELPER_DLL_LOCAL - #define UHD_HELPER_EXIMP_TMPL extern + #define UHD_HELPER_EXIM_TMPL extern #endif // Now we use the generic helper definitions above to define UHD_API and UHD_LOCAL. @@ -78,16 +78,16 @@ #ifdef UHD_DLL // defined if UHD is compiled as a DLL #ifdef UHD_DLL_EXPORTS // defined if we are building the UHD DLL (instead of using it) #define UHD_API UHD_HELPER_DLL_EXPORT - #define UHD_EXIMP_TMPL UHD_HELPER_EXIMP_TMPL + #define UHD_EXIM_TMPL UHD_HELPER_EXIM_TMPL #else #define UHD_API UHD_HELPER_DLL_IMPORT - #define UHD_EXIMP_TMPL + #define UHD_EXIM_TMPL #endif // UHD_DLL_EXPORTS #define UHD_LOCAL UHD_HELPER_DLL_LOCAL #else // UHD_DLL is not defined: this means UHD is a static lib. #define UHD_API #define UHD_LOCAL - #define UHD_EXIMP_TMPL + #define UHD_EXIM_TMPL #endif // UHD_DLL // Define force inline macro diff --git a/host/include/uhd/types/ranges.hpp b/host/include/uhd/types/ranges.hpp index 03aa69ba8..366efb1f3 100644 --- a/host/include/uhd/types/ranges.hpp +++ b/host/include/uhd/types/ranges.hpp @@ -112,12 +112,10 @@ namespace uhd{ }; - //! export a symbol for the gain range type - UHD_EXIMP_TMPL template struct UHD_API meta_range_t<float>; + //!typedef for a gain meta-range typedef meta_range_t<float> gain_range_t; - //! export a symbol for the freq range type - UHD_EXIMP_TMPL template struct UHD_API meta_range_t<double>; + //!typedef for a frequency meta-range typedef meta_range_t<double> freq_range_t; diff --git a/host/include/uhd/types/ranges.ipp b/host/include/uhd/types/ranges.ipp index 29f389fca..944ada51f 100644 --- a/host/include/uhd/types/ranges.ipp +++ b/host/include/uhd/types/ranges.ipp @@ -180,6 +180,9 @@ namespace uhd{ return ss.str(); } + UHD_EXIM_TMPL template struct UHD_API meta_range_t<float>; + UHD_EXIM_TMPL template struct UHD_API meta_range_t<double>; + } //namespace uhd #endif /* INCLUDED_UHD_TYPES_RANGES_IPP */ |