Skip to content

Commit 1ca840d

Browse files
committed
Fixes for boost 1.90
1 parent d734d8c commit 1ca840d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

occ/occlib/OccServer.cxx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
* Intergovernmental Organization or submit itself to any jurisdiction.
2424
*/
2525

26+
#define BOOST_NO_CXX20_HDR_CONCEPTS // TODO: David Rohr: Fix the
27+
// boost::lockfree::queue, must
28+
// not use trivial constructor!!!
2629

2730
#include "OccServer.h"
2831

@@ -65,7 +68,7 @@ grpc::Status OccServer::EventStream(grpc::ServerContext* context,
6568
const occ_pb::EventStreamRequest* request,
6669
grpc::ServerWriter<occ_pb::EventStreamReply>* writer)
6770
{
68-
boost::uuids::basic_random_generator<boost::mt19937> gen;
71+
boost::uuids::basic_random_generator<std::mt19937> gen;
6972
std::string id = boost::uuids::to_string(gen());
7073

7174
boost::lockfree::queue<occ_pb::DeviceEvent*> eventQueue;
@@ -100,7 +103,7 @@ grpc::Status OccServer::StateStream(grpc::ServerContext* context,
100103
(void) context;
101104
(void) request;
102105

103-
boost::uuids::basic_random_generator<boost::mt19937> gen;
106+
boost::uuids::basic_random_generator<std::mt19937> gen;
104107
std::string id = boost::uuids::to_string(gen());
105108

106109
boost::lockfree::queue<t_State> stateQueue;

occ/plugin/OccFMQCommon.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#include "util/Defer.h"
2929

3030
#include <boost/algorithm/string.hpp>
31+
#include <boost/uuid/entropy_error.hpp>
32+
#include <boost/uuid/uuid_generators.hpp>
3133
#include <iomanip>
3234

3335
std::string generateSubscriptionId(const std::string& prefix)

0 commit comments

Comments
 (0)