summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-11-10 16:44:22 -0800
committerJosh Blum <josh@joshknows.com>2012-11-10 16:44:22 -0800
commitf3203e813456ded003fe69b6084a1217c08eb962 (patch)
tree7ce3dd3db6381931678c6665e796c256dbcbfbe0
parent398c5413ea917b0e567e4bf2534f1d6c8f7ce9cc (diff)
parenta3f18afa672d4f14b8982e5666de920e9bc08f7e (diff)
downloaduhd-f3203e813456ded003fe69b6084a1217c08eb962.tar.gz
uhd-f3203e813456ded003fe69b6084a1217c08eb962.tar.bz2
uhd-f3203e813456ded003fe69b6084a1217c08eb962.zip
Merge branch 'maint34' into maint
-rw-r--r--host/include/uhd/types/stream_cmd.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/host/include/uhd/types/stream_cmd.hpp b/host/include/uhd/types/stream_cmd.hpp
index 41708e2e2..3c34c9656 100644
--- a/host/include/uhd/types/stream_cmd.hpp
+++ b/host/include/uhd/types/stream_cmd.hpp
@@ -1,5 +1,5 @@
//
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2012 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
@@ -46,10 +46,10 @@ namespace uhd{
struct UHD_API stream_cmd_t{
enum stream_mode_t {
- STREAM_MODE_START_CONTINUOUS = 'a',
- STREAM_MODE_STOP_CONTINUOUS = 'o',
- STREAM_MODE_NUM_SAMPS_AND_DONE = 'd',
- STREAM_MODE_NUM_SAMPS_AND_MORE = 'm'
+ STREAM_MODE_START_CONTINUOUS = int('a'),
+ STREAM_MODE_STOP_CONTINUOUS = int('o'),
+ STREAM_MODE_NUM_SAMPS_AND_DONE = int('d'),
+ STREAM_MODE_NUM_SAMPS_AND_MORE = int('m')
} stream_mode;
size_t num_samps;