mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-13 08:41:16 +00:00
Compare commits
No commits in common. "master" and "v1.9.2" have entirely different histories.
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include <boost/container/container_fwd.hpp>
|
||||
#include <boost/container/flat_map.hpp>
|
||||
#include <memory_resource>
|
||||
#include <boost/container/pmr/memory_resource.hpp>
|
||||
#include <cstring>
|
||||
#include <fairmq/Message.h>
|
||||
#include <stdexcept>
|
||||
|
@ -27,7 +27,7 @@ namespace fair::mq {
|
|||
|
||||
class TransportFactory;
|
||||
using byte = unsigned char;
|
||||
namespace pmr = std::pmr;
|
||||
namespace pmr = boost::container::pmr;
|
||||
|
||||
/// All FairMQ related memory resources need to inherit from this interface
|
||||
/// class for the
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include <gtest/gtest.h>
|
||||
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace
|
||||
|
@ -102,7 +101,7 @@ TEST(MemoryResources, allocator)
|
|||
|
||||
size_t session{tools::UuidHash()};
|
||||
ProgOptions config;
|
||||
config.SetProperty<std::string>("session", to_string(session));
|
||||
config.SetProperty<string>("session", to_string(session));
|
||||
|
||||
FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config);
|
||||
|
||||
|
@ -130,7 +129,7 @@ TEST(MemoryResources, getMessage)
|
|||
|
||||
size_t session{tools::UuidHash()};
|
||||
ProgOptions config;
|
||||
config.SetProperty<std::string>("session", to_string(session));
|
||||
config.SetProperty<string>("session", to_string(session));
|
||||
config.SetProperty<bool>("shm-monitor", true);
|
||||
|
||||
FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config);
|
||||
|
|
Loading…
Reference in New Issue
Block a user