mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-16 18:11:49 +00:00
Compare commits
2 Commits
dev
...
74632ceb52
Author | SHA1 | Date | |
---|---|---|---|
|
74632ceb52 | ||
|
2a44c1b366 |
2
extern/googletest
vendored
2
extern/googletest
vendored
Submodule extern/googletest updated: 7d76a231b0...04ee1b4f2a
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
#include <boost/container/container_fwd.hpp>
|
#include <boost/container/container_fwd.hpp>
|
||||||
#include <boost/container/flat_map.hpp>
|
#include <boost/container/flat_map.hpp>
|
||||||
#include <memory_resource>
|
#include <boost/container/pmr/memory_resource.hpp>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <fairmq/Message.h>
|
#include <fairmq/Message.h>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
@@ -27,7 +27,7 @@ namespace fair::mq {
|
|||||||
|
|
||||||
class TransportFactory;
|
class TransportFactory;
|
||||||
using byte = unsigned char;
|
using byte = unsigned char;
|
||||||
namespace pmr = std::pmr;
|
namespace pmr = boost::container::pmr;
|
||||||
|
|
||||||
/// All FairMQ related memory resources need to inherit from this interface
|
/// All FairMQ related memory resources need to inherit from this interface
|
||||||
/// class for the
|
/// class for the
|
||||||
|
@@ -16,7 +16,6 @@
|
|||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
@@ -102,7 +101,7 @@ TEST(MemoryResources, allocator)
|
|||||||
|
|
||||||
size_t session{tools::UuidHash()};
|
size_t session{tools::UuidHash()};
|
||||||
ProgOptions config;
|
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);
|
FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config);
|
||||||
|
|
||||||
@@ -130,7 +129,7 @@ TEST(MemoryResources, getMessage)
|
|||||||
|
|
||||||
size_t session{tools::UuidHash()};
|
size_t session{tools::UuidHash()};
|
||||||
ProgOptions config;
|
ProgOptions config;
|
||||||
config.SetProperty<std::string>("session", to_string(session));
|
config.SetProperty<string>("session", to_string(session));
|
||||||
config.SetProperty<bool>("shm-monitor", true);
|
config.SetProperty<bool>("shm-monitor", true);
|
||||||
|
|
||||||
FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config);
|
FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config);
|
||||||
|
Reference in New Issue
Block a user