mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 07:49:01 +08:00
9241e6c4b2
* quickfast * replace 'noexcept' with BOOST_ASIO_NOEXCEPT
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
diff --git a/src/Common/QuickFASTPch.h b/src/Common/QuickFASTPch.h
|
|
index 3574df8..c4ef4e1 100644
|
|
--- a/src/Common/QuickFASTPch.h
|
|
+++ b/src/Common/QuickFASTPch.h
|
|
@@ -32,7 +32,7 @@
|
|
#include <string.h>
|
|
|
|
// If building for .NET, must link boost threads dynamically
|
|
-#define BOOST_THREAD_USE_DLL
|
|
+// #define BOOST_THREAD_USE_DLL
|
|
// This reports at compile time which boost libraries will be used
|
|
// #define BOOST_LIB_DIAGNOSTIC
|
|
|
|
diff --git a/src/Communication/AsioService.h b/src/Communication/AsioService.h
|
|
index 4f61915..96f2198 100644
|
|
--- a/src/Communication/AsioService.h
|
|
+++ b/src/Communication/AsioService.h
|
|
@@ -99,6 +99,7 @@ namespace QuickFAST
|
|
{
|
|
return ioService_;
|
|
}
|
|
+ boost::asio::io_service::executor_type get_executor() BOOST_ASIO_NOEXCEPT { return ioService_.get_executor();}
|
|
|
|
///@brief Post a completion handler for later processing (usually in a different thread)
|
|
/// @param handler is the handler to be posted
|
|
diff --git a/src/Communication/AsioService_fwd.h b/src/Communication/AsioService_fwd.h
|
|
index dc2f235..6ad5e68 100644
|
|
--- a/src/Communication/AsioService_fwd.h
|
|
+++ b/src/Communication/AsioService_fwd.h
|
|
@@ -17,7 +17,8 @@ namespace boost
|
|
{
|
|
namespace asio
|
|
{
|
|
- class io_service;
|
|
+ class io_context;
|
|
+ typedef io_context io_service;
|
|
}
|
|
}
|
|
|