(ham/gnuradio-core) three patches for boost 1.67 are included now. Deleted.

4 files changed, 1 insertions, 64 deletions

diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index f2712c5b567..8ec5b6fed9c 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2018/07/16 07:55:22 mef Exp $
+$NetBSD: distinfo,v 1.30 2018/07/17 06:55:52 mef Exp $
 
 SHA1 (gnuradio-3.7.13.3.tar.gz) = 67bde0ab643081381f7acb43fc9061cad40b5ab8
 RMD160 (gnuradio-3.7.13.3.tar.gz) = 58fdfffa51a87b8091d6840f6713d0785155525f
@@ -9,6 +9,3 @@ SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7a
 SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = 7e8aa146447fc7ffd006ffd540764ae4b15da2a5
 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 42e0b52d6baba936c03e2414e83a96a19c5331e7
 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49
-SHA1 (patch-gr-blocks_lib_message__strobe__impl.cc) = 22e9a876660d8582c091ee27b4e46df562168aed
-SHA1 (patch-gr-blocks_lib_message__strobe__random__impl.cc) = a87d3e8b4243bcb5040961608bbc2644c43b9e76
-SHA1 (patch-gr-uhd_lib_usrp__block__impl.cc) = 7b8344474f94598c621dea6349d9f3224cddbae7
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc
deleted file mode 100644
index 8a6ddb98517..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_message__strobe__impl.cc,v 1.1 2018/07/10 07:05:06 dbj Exp $
-
-Fix compiling with Boost 1.67
-patch from upstream https://github.com/gnuradio/gnuradio.git
-commit 86fa85feef81e69dd1354b393118459340b94489
-
---- gr-blocks/lib/message_strobe_impl.cc.orig	2017-02-27 23:19:00.000000000 +0000
-+++ gr-blocks/lib/message_strobe_impl.cc
-@@ -90,7 +90,7 @@ namespace gr {
-     void message_strobe_impl::run()
-     {
-       while(!d_finished) {
--        boost::this_thread::sleep(boost::posix_time::milliseconds(d_period_ms));
-+        boost::this_thread::sleep(boost::posix_time::milliseconds(static_cast<long>(d_period_ms)));
-         if(d_finished) {
-           return;
-         }
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc
deleted file mode 100644
index 3d2b2077ff0..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__strobe__random__impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_message__strobe__random__impl.cc,v 1.1 2018/07/10 07:05:06 dbj Exp $
-
-Fix compiling with Boost 1.67
-patch from upstream https://github.com/gnuradio/gnuradio.git
-commit 86fa85feef81e69dd1354b393118459340b94489
-
---- gr-blocks/lib/message_strobe_random_impl.cc.orig	2017-02-27 23:19:00.000000000 +0000
-+++ gr-blocks/lib/message_strobe_random_impl.cc
-@@ -108,7 +108,7 @@ namespace gr {
-     void message_strobe_random_impl::run()
-     {
-       while(!d_finished) {
--        boost::this_thread::sleep(boost::posix_time::milliseconds(std::max(0.0f,next_delay())));
-+        boost::this_thread::sleep(boost::posix_time::milliseconds(static_cast<long>(std::max(0.0f,next_delay()))));
-         if(d_finished) {
-           return;
-         }
diff --git a/ham/gnuradio-core/patches/patch-gr-uhd_lib_usrp__block__impl.cc b/ham/gnuradio-core/patches/patch-gr-uhd_lib_usrp__block__impl.cc
deleted file mode 100644
index 159e978efbf..00000000000
--- a/ham/gnuradio-core/patches/patch-gr-uhd_lib_usrp__block__impl.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-gr-uhd_lib_usrp__block__impl.cc,v 1.1 2018/07/10 07:05:06 dbj Exp $
-
-Fix compiling with Boost 1.67
-patch from upstream https://github.com/gnuradio/gnuradio.git
-commit 86fa85feef81e69dd1354b393118459340b94489
-
---- gr-uhd/lib/usrp_block_impl.cc.orig	2017-02-27 23:19:00.000000000 +0000
-+++ gr-uhd/lib/usrp_block_impl.cc
-@@ -128,7 +128,7 @@ bool usrp_block_impl::_wait_for_locked_s
- 
-   while (true) {
-     if ((not first_lock_time.is_not_a_date_time()) and
--        (boost::get_system_time() > (first_lock_time + boost::posix_time::seconds(LOCK_TIMEOUT)))) {
-+        (boost::get_system_time() > (first_lock_time + boost::posix_time::seconds(static_cast<long>(LOCK_TIMEOUT))))) {
-       break;
-     }
- 
-@@ -139,7 +139,7 @@ bool usrp_block_impl::_wait_for_locked_s
-     else {
-       first_lock_time = boost::system_time(); //reset to 'not a date time'
- 
--      if (boost::get_system_time() > (start + boost::posix_time::seconds(LOCK_TIMEOUT))){
-+      if (boost::get_system_time() > (start + boost::posix_time::seconds(static_cast<long>(LOCK_TIMEOUT)))){
-         return false;
-       }
-     }