diff options
| author | Steven Koo <steven.koo@ni.com> | 2022-01-05 17:50:01 -0600 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-01-31 13:56:12 -0600 |
| commit | 943ebd40ca5dc5706f3b9a33296f24e006d335a7 (patch) | |
| tree | df94f8ae12148b4e8ba3be3155ebf634f7ae0574 | |
| parent | 1b3ed2072e9e0101c4fc1906ccbf977c55b9f482 (diff) | |
| download | uhd-943ebd40ca5dc5706f3b9a33296f24e006d335a7.tar.gz uhd-943ebd40ca5dc5706f3b9a33296f24e006d335a7.tar.bz2 uhd-943ebd40ca5dc5706f3b9a33296f24e006d335a7.zip | |
uhd: expose uhd::dict and fs_path with UHD_API_HEADER
uhd::dict gets typedefed into board_eeprom_t, which is used by applications
like uhd_usrp_probe, so this should be considered as part of the API.
fs_path is also an API, but because of MSVC build issues it
was not marked as so. Instead mark with UHD_API_HEADER.
Signed-off-by: Steven Koo <steven.koo@ni.com>
| -rw-r--r-- | host/include/uhd/property_tree.hpp | 5 | ||||
| -rw-r--r-- | host/include/uhd/types/dict.hpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/host/include/uhd/property_tree.hpp b/host/include/uhd/property_tree.hpp index b9c6c65aa..7edadcbda 100644 --- a/host/include/uhd/property_tree.hpp +++ b/host/include/uhd/property_tree.hpp @@ -191,11 +191,8 @@ property<T>::~property(void) /*! * FS Path: A glorified string with path manipulations. * Inspired by boost filesystem path, but without the dependency. - * - * Notice: we do not declare UHD_API on the whole structure - * because MSVC will do weird things with std::string and linking. */ -struct fs_path : std::string +struct UHD_API_HEADER fs_path : std::string { UHD_API fs_path(void); UHD_API fs_path(const char*); diff --git a/host/include/uhd/types/dict.hpp b/host/include/uhd/types/dict.hpp index cad0a628b..01f510920 100644 --- a/host/include/uhd/types/dict.hpp +++ b/host/include/uhd/types/dict.hpp @@ -18,7 +18,7 @@ namespace uhd { * A templated dictionary class with a python-like interface. */ template <typename Key, typename Val> -class dict +class UHD_API_HEADER dict { public: /*! |