diff options
Diffstat (limited to 'host/lib/utils')
| -rw-r--r-- | host/lib/utils/paths.cpp | 6 | ||||
| -rw-r--r-- | host/lib/utils/platform.cpp | 4 | ||||
| -rw-r--r-- | host/lib/utils/thread_priority.cpp | 2 | 
3 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp index f29318ddd..a9c9965c8 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp @@ -367,10 +367,10 @@ std::string uhd::find_utility(std::string name) {          .string();  } -std::string uhd::print_utility_error(std::string name){ +std::string uhd::print_utility_error(const std::string &name, const std::string &args){      #ifdef UHD_PLATFORM_WIN32 -    return "As an Administrator, please run:\n\n\"" + find_utility(name) + "\""; +    return "As an Administrator, please run:\n\n\"" + find_utility(name) + args +  "\"";      #else -    return "Please run:\n\n \"" + find_utility(name) + "\""; +    return "Please run:\n\n \"" + find_utility(name) + (args.empty() ? "" : (" " + args)) + "\"";      #endif  } diff --git a/host/lib/utils/platform.cpp b/host/lib/utils/platform.cpp index e2f92039e..a9cef663b 100644 --- a/host/lib/utils/platform.cpp +++ b/host/lib/utils/platform.cpp @@ -1,5 +1,5 @@  // -// Copyright 2010-2012 Ettus Research LLC +// Copyright 2010-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 @@ -19,7 +19,7 @@  #include <uhd/config.hpp>  #include <boost/functional/hash.hpp>  #ifdef UHD_PLATFORM_WIN32 -#include <Windows.h> +#include <windows.h>  #else  #include <unistd.h>  #endif diff --git a/host/lib/utils/thread_priority.cpp b/host/lib/utils/thread_priority.cpp index 7c3faa37a..af25d088a 100644 --- a/host/lib/utils/thread_priority.cpp +++ b/host/lib/utils/thread_priority.cpp @@ -74,7 +74,7 @@ static void check_priority_range(float priority){  #ifdef HAVE_WIN_SETTHREADPRIORITY      #include <windows.h> -    void uhd::set_thread_priority(float priority, bool realtime){ +    void uhd::set_thread_priority(float priority, UHD_UNUSED(bool realtime)){          check_priority_range(priority);          /*  | 
