summaryrefslogtreecommitdiffstats
path: root/src/DabMultiplexer.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-10-28 23:44:15 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-10-28 23:44:15 +0200
commit32bdfb274ec20318dd7d45fb62cd6e51323453f7 (patch)
tree1142386bf9fb2f90738876cc3e572c0be353c868 /src/DabMultiplexer.cpp
parentf0b272d734469552b9747ec3e00a5a3a22811749 (diff)
downloaddabmux-32bdfb274ec20318dd7d45fb62cd6e51323453f7.tar.gz
dabmux-32bdfb274ec20318dd7d45fb62cd6e51323453f7.tar.bz2
dabmux-32bdfb274ec20318dd7d45fb62cd6e51323453f7.zip
Replace NULL by nullptr
Diffstat (limited to 'src/DabMultiplexer.cpp')
-rw-r--r--src/DabMultiplexer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/DabMultiplexer.cpp b/src/DabMultiplexer.cpp
index 90d3d02..c789763 100644
--- a/src/DabMultiplexer.cpp
+++ b/src/DabMultiplexer.cpp
@@ -162,7 +162,7 @@ void DabMultiplexer::prepare()
* Ideally, we must be able to restart transmission s.t. the receiver
* synchronisation is preserved.
*/
- gettimeofday(&mnsc_time, NULL);
+ gettimeofday(&mnsc_time, nullptr);
#if HAVE_OUTPUT_EDI
edi_time = chrono::system_clock::now();
@@ -212,7 +212,7 @@ void DabMultiplexer::prepare_subchannels()
void DabMultiplexer::prepare_services_components()
{
set<uint32_t> ids;
- dabProtection* protection = NULL;
+ dabProtection* protection = nullptr;
vector<DabComponent*>::iterator component;
vector<DabSubchannel*>::iterator subchannel;
@@ -301,7 +301,7 @@ void DabMultiplexer::prepare_services_components()
void DabMultiplexer::prepare_data_inputs()
{
- dabProtection* protection = NULL;
+ dabProtection* protection = nullptr;
vector<DabSubchannel*>::iterator subchannel;
// Prepare and check the data inputs