From b01bdc552902318c35095e00708420752ac04031 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 12 Aug 2016 10:14:18 -0700 Subject: Updated submodule pointer to track UHD-3.9.LTS branch --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 473a21289..b625125db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "fpga-src"] path = fpga-src url = https://github.com/EttusResearch/fpga.git - branch = maint + branch = UHD-3.9.LTS -- cgit v1.2.3 From ef2fa561b51b36bb12df7fb6264545a9be053cec Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 12 Aug 2016 14:08:55 -0700 Subject: cores: Fixed typo in time_core_3000 --- host/lib/usrp/cores/time_core_3000.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/lib/usrp/cores/time_core_3000.cpp b/host/lib/usrp/cores/time_core_3000.cpp index 694edf31c..45b1750d2 100644 --- a/host/lib/usrp/cores/time_core_3000.cpp +++ b/host/lib/usrp/cores/time_core_3000.cpp @@ -73,10 +73,10 @@ struct time_core_3000_impl : time_core_3000 //useful warning for debugging actual rate const size_t ticks_elapsed = size_t(_tick_rate*approx_secs); - const size_t appox_rate = size_t(ticks_elapsed/(sleep_millis/1e3)); + const size_t approx_rate = size_t(ticks_elapsed/(sleep_millis/1e3)); if (test_fail) UHD_MSG(warning) << "Expecting clock rate: " << (_tick_rate/1e6) << " MHz\n" - << "Appoximate clock rate: " << (appox_rate/1e6) << " MHz\n" + << "Approximate clock rate: " << (approx_rate/1e6) << " MHz\n" << std::endl; } -- cgit v1.2.3 From a1d6f4f363a5e782b72839127bd845398609424c Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 12 Aug 2016 18:02:17 -0700 Subject: nocscript: Removed compiler warning --- host/tests/nocscript_expr_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/host/tests/nocscript_expr_test.cpp b/host/tests/nocscript_expr_test.cpp index 2ee5dafdf..f82a613a3 100644 --- a/host/tests/nocscript_expr_test.cpp +++ b/host/tests/nocscript_expr_test.cpp @@ -327,10 +327,10 @@ class functable_mockup_impl : public function_table // We don't actually need this void register_function( - const std::string &name, - const function_table::function_ptr &ptr, - const expression::type_t return_type, - const expression_function::argtype_list_type &sig + const std::string &, + const function_table::function_ptr &, + const expression::type_t, + const expression_function::argtype_list_type & ) {}; }; -- cgit v1.2.3