aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2018-04-17 16:50:51 -0700
committerMartin Braun <martin.braun@ettus.com>2018-04-18 10:11:06 -0700
commitb407469bb4b36b8551261ee1249063ef3d5a9029 (patch)
treee472ada0c593f38971aaa63976c0f13662e49267
parent2f6253667eec6be60e27d43ced7a72e689838e94 (diff)
downloaduhd-b407469bb4b36b8551261ee1249063ef3d5a9029.tar.gz
uhd-b407469bb4b36b8551261ee1249063ef3d5a9029.tar.bz2
uhd-b407469bb4b36b8551261ee1249063ef3d5a9029.zip
niusrprio: Move a const from header to impl
This avoids having to redeclare the static const to avoid linker errors.
-rw-r--r--host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp2
-rw-r--r--host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp
index 0aad0c1ba..b05cf0d5d 100644
--- a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp
+++ b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp
@@ -45,8 +45,6 @@ public:
nirio_status niusrprio_download_fpga_to_flash(
NIUSRPRIO_DOWNLOAD_FPGA_TO_FLASH_ARGS);
- static const int64_t DEFAULT_TIMEOUT_IN_MS = 5000;
-
private:
static nirio_status _boost_error_to_nirio_status(const boost::system::error_code& err);
diff --git a/host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp b/host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp
index f8a733a2b..7582b4734 100644
--- a/host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp
+++ b/host/lib/transport/nirio/rpc/usrprio_rpc_client.cpp
@@ -8,6 +8,11 @@
#include <uhd/transport/nirio/rpc/usrprio_rpc_client.hpp>
#include <uhd/utils/platform.hpp>
+namespace {
+ constexpr int64_t DEFAULT_TIMEOUT_IN_MS = 5000;
+}
+
+
namespace uhd { namespace usrprio_rpc {
usrprio_rpc_client::usrprio_rpc_client(