diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-06-17 14:35:17 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-06-17 14:35:17 -0700 |
commit | f693349f12a66cfad2159779757e2ea1d6d483be (patch) | |
tree | 1c335011ec094ab03b3faaf892792b60ed3b80c4 /host/utils/uhd_usrp_probe.cpp | |
parent | e103b5e67061c9b22cce2e36cf9b40a8213ecb82 (diff) | |
parent | 9cc4e16b77d074c8d416725ead1afb8898007eb3 (diff) | |
download | uhd-f693349f12a66cfad2159779757e2ea1d6d483be.tar.gz uhd-f693349f12a66cfad2159779757e2ea1d6d483be.tar.bz2 uhd-f693349f12a66cfad2159779757e2ea1d6d483be.zip |
Merge branch 'maint'
Diffstat (limited to 'host/utils/uhd_usrp_probe.cpp')
-rw-r--r-- | host/utils/uhd_usrp_probe.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/utils/uhd_usrp_probe.cpp b/host/utils/uhd_usrp_probe.cpp index 4a84fef55..ae86b0dba 100644 --- a/host/utils/uhd_usrp_probe.cpp +++ b/host/utils/uhd_usrp_probe.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011,2015 Ettus Research LLC +// Copyright 2010-2011,2015-2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -172,7 +172,7 @@ static std::string get_mboard_pp_string(property_tree::sptr tree, const fs_path ss << make_border(get_dboard_pp_string("TX", tree, path / "dboards" / name)); } } - catch (const uhd::lookup_error &e) { + catch (const uhd::lookup_error&) { /* nop */ } return ss.str(); |