aboutsummaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-03 17:02:15 -0800
committerJosh Blum <josh@joshknows.com>2011-03-03 17:02:15 -0800
commit942c69b710510e6143a6f3c22bbe3ff0687f4bc6 (patch)
treefc5a786effc07735e22658249f6bee29b69e94f9 /host/include
parentd2556f45c943e54d1b74afe94bff98cd81661bb2 (diff)
parent01ab237b0fcb22e5098bdda139ca76fe7e5d21cb (diff)
downloaduhd-942c69b710510e6143a6f3c22bbe3ff0687f4bc6.tar.gz
uhd-942c69b710510e6143a6f3c22bbe3ff0687f4bc6.tar.bz2
uhd-942c69b710510e6143a6f3c22bbe3ff0687f4bc6.zip
Merge branch 'master' into next
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/types/sensors.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/include/uhd/types/sensors.hpp b/host/include/uhd/types/sensors.hpp
index 97d82b4e2..529e1e3e3 100644
--- a/host/include/uhd/types/sensors.hpp
+++ b/host/include/uhd/types/sensors.hpp
@@ -41,14 +41,14 @@ namespace uhd{
* Create a sensor value from a boolean.
* \param name the name of the sensor
* \param value the value true or false
- * \param ufalse the unit string when value is false
* \param utrue the unit string when value is true
+ * \param ufalse the unit string when value is false
*/
sensor_value_t(
const std::string &name,
bool value,
- const std::string &ufalse,
- const std::string &utrue
+ const std::string &utrue,
+ const std::string &ufalse
);
/*!