haplohseq: ioService -> ioContext

[Jason Bacon (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Mon Feb 3 08:34:47 2025 -0600
Changeset:	d4e9936c4c36bef4bbe8cd978c43e8fdbcd260c2

Modified Files:
	haplohseq/distinfo
	haplohseq/patches/patch-src_HaplohSeq.cpp

Log Message:
haplohseq: ioService -> ioContext

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d4e9936c4c36bef4bbe8cd978c43e8fdbcd260c2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 haplohseq/distinfo                        |  2 +-
 haplohseq/patches/patch-src_HaplohSeq.cpp | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diffs:
diff --git a/haplohseq/distinfo b/haplohseq/distinfo
index a6071e47fd..b505fd8d4c 100644
--- a/haplohseq/distinfo
+++ b/haplohseq/distinfo
@@ -3,4 +3,4 @@ $NetBSD: distinfo,v 1.1 2024/10/12 12:19:51 bacon Exp $
 BLAKE2s (haplohseq-0.1.2.2-e4892945eced075a5bb98f208786cdf85eb3d82a.tar.gz) = dbd48a3854197dbf71189a56bdd0075ce8e6a78bca92b58673ae2770eae3daa6
 SHA512 (haplohseq-0.1.2.2-e4892945eced075a5bb98f208786cdf85eb3d82a.tar.gz) = 8de2c75d4e443eab79f520d43bd2e0c238dca798bf53cc7821d6fe8bdf94f3d3ae3b9319b9b21aae10dab6b52e5c1e81380380c456a240bfcfa8863b83c5feff
 Size (haplohseq-0.1.2.2-e4892945eced075a5bb98f208786cdf85eb3d82a.tar.gz) = 12085199 bytes
-SHA1 (patch-src_HaplohSeq.cpp) = 9907808c0cb1f353f7c9784fd22def84e77a2a9d
+SHA1 (patch-src_HaplohSeq.cpp) = 7aa7d525b573f18b711b698c5509b5038911ad9a
diff --git a/haplohseq/patches/patch-src_HaplohSeq.cpp b/haplohseq/patches/patch-src_HaplohSeq.cpp
index c2b88cb4e1..15aa93ced1 100644
--- a/haplohseq/patches/patch-src_HaplohSeq.cpp
+++ b/haplohseq/patches/patch-src_HaplohSeq.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/HaplohSeq.cpp.orig	2025-01-26 13:47:41.918585702 +0000
+--- src/HaplohSeq.cpp.orig	2021-01-23 22:44:43.000000000 +0000
 +++ src/HaplohSeq.cpp
 @@ -195,14 +195,14 @@ void HaplohSeq::runBafHaplohseq(	std::st
  	for (unsigned int i = 0; i < numParamEventStarts; i++) {
@@ -9,15 +9,15 @@ $NetBSD$
 -		boost::asio::io_service ioService;
 -	//	boost::asio::io_service::work work(ioService);
 -		boost::shared_ptr<boost::asio::io_service::work> work(new boost::asio::io_service::work(ioService));
-+		boost::asio::io_context ioService;
-+	//	boost::asio::io_context::work work(ioService);
-+		boost::shared_ptr<boost::asio::io_context::work> work(new boost::asio::io_context::work(ioService));
++		boost::asio::io_context ioContext;
++	//	boost::asio::io_context::work work(ioContext);
++		boost::shared_ptr<boost::asio::io_context::work> work(new boost::asio::io_context::work(ioContext));
  		boost::thread_group threadPool;
  
  		// Spawn worker threads
  		for (std::size_t t = 0; t < numThreads; t++) {
 -			threadPool.create_thread(boost::bind((boost::asio::io_context::count_type (boost::asio::io_service::*)())&boost::asio::io_service::run, &ioService));
-+			threadPool.create_thread(boost::bind((boost::asio::io_context::count_type (boost::asio::io_context::*)())&boost::asio::io_context::run, &ioService));
++			threadPool.create_thread(boost::bind((boost::asio::io_context::count_type (boost::asio::io_context::*)())&boost::asio::io_context::run, &ioContext));
  		}
  
  		std::map<std::string, boost::shared_ptr<Hmm> > chrHmms;
@@ -26,7 +26,7 @@ $NetBSD$
  			std::cout << "Posting job to thread pool for chromosome " << chr << "\n";
  			// IMPORTANT: do not pass shared_ptr by reference because the shared_ptr expects a new pointer to the object
 -			ioService.post(boost::bind(&HaplohSeq::runBafHaplohseqChr, this,
-+			ioService.get_executor().post(boost::bind(&HaplohSeq::runBafHaplohseqChr, this,
++			ioContext.post(boost::bind(&HaplohSeq::runBafHaplohseqChr, this,
  													chr,
  													boost::ref(chrHmms),
  													boost::ref(fp),
@@ -37,24 +37,25 @@ $NetBSD$
 -		boost::asio::io_service ioService;
 -	//	boost::asio::io_service::work work(ioService);
 -		boost::shared_ptr<boost::asio::io_service::work> work(new boost::asio::io_service::work(ioService));
-+		boost::asio::io_context ioService;
-+	//	boost::asio::io_context::work work(ioService);
-+		boost::shared_ptr<boost::asio::io_context::work> work(new boost::asio::io_context::work(ioService));
++		boost::asio::io_context ioContext;
++	//	boost::asio::io_context::work work(ioContext);
++		boost::shared_ptr<boost::asio::io_context::work> work(new boost::asio::io_context::work(ioContext));
  		boost::thread_group threadPool;
  
  		// Spawn worker threads
  		for (std::size_t t = 0; t < numThreads; t++) {
 -			threadPool.create_thread(boost::bind((boost::asio::io_context::count_type (boost::asio::io_service::*)())&boost::asio::io_service::run, &ioService));
-+			threadPool.create_thread(boost::bind((boost::asio::io_context::count_type (boost::asio::io_context::*)())&boost::asio::io_context::run, &ioService));
++			threadPool.create_thread(boost::bind((boost::asio::io_context::count_type (boost::asio::io_context::*)())&boost::asio::io_context::run, &ioContext));
  		}
  
  		std::map<std::string, boost::shared_ptr<Hmm> > chrHmms;
-@@ -438,7 +438,7 @@ void HaplohSeq::runVcfHaplohseq(	std::st
+@@ -438,7 +438,8 @@ void HaplohSeq::runVcfHaplohseq(	std::st
  
  //			std::cout << "Posting job to thread pool for chromosome " << chr << "\n";
  			// IMPORTANT: do not pass shared_ptr by reference because the shared_ptr expects a new pointer to the object
 -			ioService.post(boost::bind(&HaplohSeq::runVcfHaplohseqChr, this,
-+			ioService.get_executor().post(boost::bind(&HaplohSeq::runVcfHaplohseqChr, this,
++			// https://github.com/boostorg/asio/issues/110
++			ioContext.get_executor().post(boost::bind(&HaplohSeq::runVcfHaplohseqChr, this,
  													chr,
  													boost::ref(chrHmms),
  													boost::ref(fp),