diff options
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/transport/nirio/rpc/rpc_client.cpp | 5 | ||||
| -rw-r--r-- | host/lib/utils/log.cpp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/host/lib/transport/nirio/rpc/rpc_client.cpp b/host/lib/transport/nirio/rpc/rpc_client.cpp index f8dc26b50..0c4b8fe3c 100644 --- a/host/lib/transport/nirio/rpc/rpc_client.cpp +++ b/host/lib/transport/nirio/rpc/rpc_client.cpp @@ -104,6 +104,11 @@ rpc_client::rpc_client ( } catch (boost::exception&) { UHD_LOG << "rpc_client connection request cancelled/aborted." << std::endl; _exec_err.assign(boost::asio::error::connection_aborted, boost::asio::error::get_system_category()); +#if BOOST_VERSION < 104700 + } catch (std::exception& e) { + UHD_LOG << "rpc_client connection error: " << e.what() << std::endl; + _exec_err.assign(boost::asio::error::connection_aborted, boost::asio::error::get_system_category()); +#endif } } diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp index d6d1786c7..31ee0c991 100644 --- a/host/lib/utils/log.cpp +++ b/host/lib/utils/log.cpp @@ -1,5 +1,5 @@ // -// Copyright 2012 Ettus Research LLC +// Copyright 2012,2014 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 @@ -117,11 +117,11 @@ UHD_SINGLETON_FCN(log_resource_type, log_rs); **********************************************************************/ //! get the relative file path from the host directory static std::string get_rel_file_path(const fs::path &file){ - fs::path abs_path = file.branch_path(); + fs::path abs_path = file.parent_path(); fs::path rel_path = file.leaf(); while (not abs_path.empty() and abs_path.leaf() != "host"){ rel_path = abs_path.leaf() / rel_path; - abs_path = abs_path.branch_path(); + abs_path = abs_path.parent_path(); } return rel_path.string(); } |