Skip to content

Fixes for boost 1.90 #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knopers8 merged 1 commit into from
Mar 3, 2026
Merged

Fixes for boost 1.90 #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions occ/occlib/OccServer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
* Intergovernmental Organization or submit itself to any jurisdiction.
*/

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

#include "OccServer.h"

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

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

boost::uuids::basic_random_generator<boost::mt19937> gen;
boost::uuids::basic_random_generator<std::mt19937> gen;
std::string id = boost::uuids::to_string(gen());

boost::lockfree::queue<t_State> stateQueue;
Expand Down
2 changes: 2 additions & 0 deletions occ/plugin/OccFMQCommon.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "util/Defer.h"

#include <boost/algorithm/string.hpp>
#include <boost/uuid/entropy_error.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <iomanip>

std::string generateSubscriptionId(const std::string& prefix)
Expand Down