diff options
author | Josh Blum <josh@joshknows.com> | 2010-10-27 16:37:08 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-10-27 16:37:08 -0700 |
commit | f9edd3865ca0f61a9e80fd917521b49292d5ecb1 (patch) | |
tree | 5afaf7a691dbb5849c624c8af46501ddd414be9e /host/lib/usrp/wrapper_utils.hpp | |
parent | 971f6de77c6b67515b5d37d748e823da155b310c (diff) | |
parent | 630c007bbbabce90ffe3578d47ad7acc187bdc30 (diff) | |
download | uhd-f9edd3865ca0f61a9e80fd917521b49292d5ecb1.tar.gz uhd-f9edd3865ca0f61a9e80fd917521b49292d5ecb1.tar.bz2 uhd-f9edd3865ca0f61a9e80fd917521b49292d5ecb1.zip |
Merge branch 'next' into flow_ctrl
Conflicts:
host/include/uhd/types/metadata.hpp
Diffstat (limited to 'host/lib/usrp/wrapper_utils.hpp')
-rw-r--r-- | host/lib/usrp/wrapper_utils.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/wrapper_utils.hpp b/host/lib/usrp/wrapper_utils.hpp index aee230fc0..6f9fdbfca 100644 --- a/host/lib/usrp/wrapper_utils.hpp +++ b/host/lib/usrp/wrapper_utils.hpp @@ -40,7 +40,7 @@ static inline void do_samp_rate_warning_message( ){ static const double max_allowed_error = 1.0; //Sps if (std::abs(target_rate - actual_rate) > max_allowed_error){ - uhd::print_warning(str(boost::format( + uhd::warning::post(str(boost::format( "The hardware does not support the requested %s sample rate:\n" "Target sample rate: %f MSps\n" "Actual sample rate: %f MSps\n" @@ -55,7 +55,7 @@ static inline void do_tune_freq_warning_message( ){ static const double max_allowed_error = 1.0; //Hz if (std::abs(target_freq - actual_freq) > max_allowed_error){ - uhd::print_warning(str(boost::format( + uhd::warning::post(str(boost::format( "The hardware does not support the requested %s frequency:\n" "Target frequency: %f MHz\n" "Actual frequency: %f MHz\n" |