diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-02 16:08:57 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-02 16:08:57 -0700 |
| commit | fb8292238c7efff4a5b2a7ae26d3a2835f9be3ce (patch) | |
| tree | 4169d42bf56151fcc565785b6de9b23e101ca932 /gr-uhd | |
| parent | bbb8650eb525a58be2a427daa38ff6c464c5b882 (diff) | |
| parent | 27608bfcc97e09372630237618eddce8a02d2fe6 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-uhd/swig/uhd_swig.i
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/swig/uhd_swig.i | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 053f4a999f..d814a5ae0c 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -125,4 +125,12 @@ static const size_t ALL_MBOARDS = uhd::usrp::multi_usrp::ALL_MBOARDS; %} static const size_t ALL_MBOARDS; +%{ +#include <uhd/version.hpp> +std::string get_version_string(void){ + return uhd::get_version_string(); +} +%} +std::string get_version_string(void); + #endif /* GR_HAVE_UHD */ |