summaryrefslogtreecommitdiffstats
path: root/src/OutputUHD.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-04-16 21:07:10 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-04-16 21:07:10 +0200
commit307996c7ebfd03186a8044cc69b764b71c51e79e (patch)
treed5b2071124be1e59d14e351c4ba6e3834284e612 /src/OutputUHD.h
parent28b152d40742481d8eae0108afd4e6bf7a17eb2a (diff)
downloaddabmod-307996c7ebfd03186a8044cc69b764b71c51e79e.tar.gz
dabmod-307996c7ebfd03186a8044cc69b764b71c51e79e.tar.bz2
dabmod-307996c7ebfd03186a8044cc69b764b71c51e79e.zip
remove using directives from .h files
Diffstat (limited to 'src/OutputUHD.h')
-rw-r--r--src/OutputUHD.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/OutputUHD.h b/src/OutputUHD.h
index 530a30a..990822e 100644
--- a/src/OutputUHD.h
+++ b/src/OutputUHD.h
@@ -71,8 +71,6 @@ DESCRIPTION:
typedef std::complex<float> complexf;
-using namespace boost;
-
struct UHDWorkerFrameData {
// Buffer holding frame data
void* buf;
@@ -112,7 +110,7 @@ struct UHDWorkerData {
bool muting;
// A barrier to synchronise the two threads
- shared_ptr<barrier> sync_barrier;
+ boost::shared_ptr<boost::barrier> sync_barrier;
// What to do when the reference clock PLL loses lock
refclk_lock_loss_behaviour_t refclk_lock_loss_behaviour;
@@ -197,10 +195,12 @@ class OutputUHD: public ModOutput, public RemoteControllable {
*/
/* Base function to set parameters. */
- virtual void set_parameter(const string& parameter, const string& value);
+ virtual void set_parameter(const std::string& parameter,
+ const std::string& value);
/* Getting a parameter always returns a string. */
- virtual const string get_parameter(const string& parameter) const;
+ virtual const std::string get_parameter(
+ const std::string& parameter) const;
protected:
@@ -208,7 +208,7 @@ class OutputUHD: public ModOutput, public RemoteControllable {
EtiReader *myEtiReader;
OutputUHDConfig myConf;
uhd::usrp::multi_usrp::sptr myUsrp;
- shared_ptr<barrier> mySyncBarrier;
+ boost::shared_ptr<boost::barrier> mySyncBarrier;
UHDWorker worker;
bool first_run;
struct UHDWorkerData uwd;