diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-18 15:43:50 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-18 15:43:50 -0800 |
| commit | dd03a2a0dff2d34e7ffca95531eaa42c85fd756c (patch) | |
| tree | 7ea89df802af80caed907d18173f990689662764 /host/include | |
| parent | 28d49657a959feeec9142094735fb4e184c3e9a4 (diff) | |
| parent | 89ae5f3f651cff22226e2b2c0ce0ed796dad4c71 (diff) | |
| download | uhd-dd03a2a0dff2d34e7ffca95531eaa42c85fd756c.tar.gz uhd-dd03a2a0dff2d34e7ffca95531eaa42c85fd756c.tar.bz2 uhd-dd03a2a0dff2d34e7ffca95531eaa42c85fd756c.zip | |
Merge branches 'master' and 'master' of ettus.sourcerepo.com:ettus/uhdpriv
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/config.hpp | 6 | ||||
| -rw-r--r-- | host/include/uhd/types/ranges.hpp | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 2918c2340..316d60c2b 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -56,14 +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 #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 #else #define UHD_HELPER_DLL_IMPORT #define UHD_HELPER_DLL_EXPORT #define UHD_HELPER_DLL_LOCAL + #define UHD_HELPER_EXIMP_TMPL extern #endif // Now we use the generic helper definitions above to define UHD_API and UHD_LOCAL. @@ -75,13 +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 #else #define UHD_API UHD_HELPER_DLL_IMPORT + #define UHD_EXIMP_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 #endif // UHD_DLL // Define force inline macro diff --git a/host/include/uhd/types/ranges.hpp b/host/include/uhd/types/ranges.hpp index b13f80ae4..03aa69ba8 100644 --- a/host/include/uhd/types/ranges.hpp +++ b/host/include/uhd/types/ranges.hpp @@ -22,6 +22,7 @@ #include <uhd/utils/pimpl.hpp> #include <string> #include <vector> +#include <string> namespace uhd{ @@ -112,11 +113,11 @@ namespace uhd{ }; //! export a symbol for the gain range type - template struct UHD_API meta_range_t<float>; + UHD_EXIMP_TMPL template struct UHD_API meta_range_t<float>; typedef meta_range_t<float> gain_range_t; //! export a symbol for the freq range type - template struct UHD_API meta_range_t<double>; + UHD_EXIMP_TMPL template struct UHD_API meta_range_t<double>; typedef meta_range_t<double> freq_range_t; |