summaryrefslogtreecommitdiffstats
path: root/src/DabMux.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2015-12-21 22:53:23 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2015-12-21 22:53:23 +0100
commit863d9fe32fbff286d4c359d6a5c29184ed511866 (patch)
treefdcb2c34837848db7904eb7f73890da3ff18f6fb /src/DabMux.cpp
parent3f179d73b72c2fcb496e5bada79a782f5d722ffe (diff)
downloaddabmux-863d9fe32fbff286d4c359d6a5c29184ed511866.tar.gz
dabmux-863d9fe32fbff286d4c359d6a5c29184ed511866.tar.bz2
dabmux-863d9fe32fbff286d4c359d6a5c29184ed511866.zip
Replace some boost shared_ptr by std ones
Diffstat (limited to 'src/DabMux.cpp')
-rw-r--r--src/DabMux.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/DabMux.cpp b/src/DabMux.cpp
index f3f0c95..18fee19 100644
--- a/src/DabMux.cpp
+++ b/src/DabMux.cpp
@@ -29,7 +29,7 @@
# include "config.h"
#endif
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/info_parser.hpp>
#include <cstdio>
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
int returnCode = 0;
ptree pt;
- std::vector<boost::shared_ptr<DabOutput> > outputs;
+ std::vector<std::shared_ptr<DabOutput> > outputs;
try {
if (argc == 2) { // Assume the only argument is a config file
@@ -276,15 +276,13 @@ int main(int argc, char *argv[])
/************** READ REMOTE CONTROL PARAMETERS *************/
int telnetport = pt.get<int>("remotecontrol.telnetport", 0);
- boost::shared_ptr<BaseRemoteController> rc;
+ std::shared_ptr<BaseRemoteController> rc;
if (telnetport != 0) {
- rc = boost::shared_ptr<RemoteControllerTelnet>(
- new RemoteControllerTelnet(telnetport));
+ rc = std::make_shared<RemoteControllerTelnet>(telnetport);
}
else {
- rc = boost::shared_ptr<RemoteControllerDummy>(
- new RemoteControllerDummy());
+ rc = std::make_shared<RemoteControllerDummy>();
}
DabMultiplexer mux(rc, pt);
@@ -412,7 +410,7 @@ int main(int argc, char *argv[])
return -1;
}
- boost::shared_ptr<DabOutput> dabout(output);
+ std::shared_ptr<DabOutput> dabout(output);
outputs.push_back(dabout);
}