5 files changed, 8 insertions, 9 deletions
diff --git a/gnuradio-runtime/lib/block_executor.cc b/gnuradio-runtime/lib/block_executor.cc
index 322c7041b5..e8be9b3ca9 100644
--- a/gnuradio-runtime/lib/block_executor.cc
+++ b/gnuradio-runtime/lib/block_executor.cc
@@ -21,7 +21,6 @@
 #include <block_executor.h>
 #include <stdio.h>
 #include <boost/format.hpp>
-#include <boost/make_unique.hpp>
 #include <boost/thread.hpp>
 #include <iostream>
 #include <limits>
diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc
index 18b60b9a47..3ef5974556 100644
--- a/gnuradio-runtime/lib/hier_block2.cc
+++ b/gnuradio-runtime/lib/hier_block2.cc
@@ -16,8 +16,8 @@
 #include <gnuradio/flowgraph.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/io_signature.h>
-#include <boost/make_unique.hpp>
 #include <iostream>
+#include <memory>
 
 namespace gr {
 
@@ -37,7 +37,7 @@ hier_block2::hier_block2(const std::string& name,
                          gr::io_signature::sptr input_signature,
                          gr::io_signature::sptr output_signature)
     : basic_block(name, input_signature, output_signature),
-      d_detail(boost::make_unique<hier_block2_detail>(this)),
+      d_detail(std::make_unique<hier_block2_detail>(this)),
       hier_message_ports_in(pmt::PMT_NIL),
       hier_message_ports_out(pmt::PMT_NIL)
 {
diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc
index f282ca9276..4dbab39aa0 100644
--- a/gnuradio-runtime/lib/logger.cc
+++ b/gnuradio-runtime/lib/logger.cc
@@ -20,8 +20,8 @@
 
 #include <gnuradio/logger.h>
 #include <gnuradio/prefs.h>
-#include <boost/make_unique.hpp>
 #include <algorithm>
+#include <memory>
 #include <stdexcept>
 
 namespace gr {
@@ -96,7 +96,7 @@ void logger_config::load_config(std::string filename, unsigned int watch_period)
         logger_configured = logger_load_config(instance.filename);
         // Start watch if required
         if (instance.watch_period > 0) {
-            instance.watch_thread = boost::make_unique<boost::thread>(
+            instance.watch_thread = std::make_unique<boost::thread>(
                 watch_file, instance.filename, instance.watch_period);
         }
     }
diff --git a/gnuradio-runtime/lib/thread/thread_group.cc b/gnuradio-runtime/lib/thread/thread_group.cc
index 6c7512ab28..c4fcfcd042 100644
--- a/gnuradio-runtime/lib/thread/thread_group.cc
+++ b/gnuradio-runtime/lib/thread/thread_group.cc
@@ -13,7 +13,7 @@
  */
 
 #include <gnuradio/thread/thread_group.h>
-#include <boost/make_unique.hpp>
+#include <memory>
 
 namespace gr {
 namespace thread {
@@ -26,7 +26,7 @@ boost::thread* thread_group::create_thread(const boost::function0<void>& threadf
 {
     // No scoped_lock required here since the only "shared data" that's
     // modified here occurs inside add_thread which does scoped_lock.
-    auto thrd = boost::make_unique<boost::thread>(threadfunc);
+    auto thrd = std::make_unique<boost::thread>(threadfunc);
     auto thrdp = thrd.get();
     add_thread(std::move(thrd));
     return thrdp;
diff --git a/gnuradio-runtime/lib/top_block.cc b/gnuradio-runtime/lib/top_block.cc
index c7e0ee74ce..319bb7a0c1 100644
--- a/gnuradio-runtime/lib/top_block.cc
+++ b/gnuradio-runtime/lib/top_block.cc
@@ -18,8 +18,8 @@
 #include <gnuradio/prefs.h>
 #include <gnuradio/top_block.h>
 #include <unistd.h>
-#include <boost/make_unique.hpp>
 #include <iostream>
+#include <memory>
 
 namespace gr {
 top_block_sptr make_top_block(const std::string& name, bool catch_exceptions)
@@ -29,7 +29,7 @@ top_block_sptr make_top_block(const std::string& name, bool catch_exceptions)
 
 top_block::top_block(const std::string& name, bool catch_exceptions)
     : hier_block2(name, io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)),
-      d_impl(boost::make_unique<top_block_impl>(this, catch_exceptions))
+      d_impl(std::make_unique<top_block_impl>(this, catch_exceptions))
 {
 }