diff --git a/fairmq/shmem/FairMQMessageSHM.cxx b/fairmq/shmem/FairMQMessageSHM.cxx index 6ff59dc0..34fe50c9 100644 --- a/fairmq/shmem/FairMQMessageSHM.cxx +++ b/fairmq/shmem/FairMQMessageSHM.cxx @@ -19,8 +19,8 @@ using namespace std; using namespace fair::mq::shmem; -namespace bipc = boost::interprocess; -namespace bpt = boost::posix_time; +namespace bipc = ::boost::interprocess; +namespace bpt = ::boost::posix_time; atomic FairMQMessageSHM::fInterrupted(false); fair::mq::Transport FairMQMessageSHM::fTransportType = fair::mq::Transport::SHM; diff --git a/fairmq/shmem/FairMQTransportFactorySHM.cxx b/fairmq/shmem/FairMQTransportFactorySHM.cxx index ce5695ed..03ff2ec6 100644 --- a/fairmq/shmem/FairMQTransportFactorySHM.cxx +++ b/fairmq/shmem/FairMQTransportFactorySHM.cxx @@ -28,9 +28,9 @@ using namespace std; using namespace fair::mq::shmem; -namespace bfs = boost::filesystem; -namespace bpt = boost::posix_time; -namespace bipc = boost::interprocess; +namespace bfs = ::boost::filesystem; +namespace bpt = ::boost::posix_time; +namespace bipc = ::boost::interprocess; fair::mq::Transport FairMQTransportFactorySHM::fTransportType = fair::mq::Transport::SHM; diff --git a/fairmq/shmem/FairMQUnmanagedRegionSHM.cxx b/fairmq/shmem/FairMQUnmanagedRegionSHM.cxx index 791f281b..7bc18e89 100644 --- a/fairmq/shmem/FairMQUnmanagedRegionSHM.cxx +++ b/fairmq/shmem/FairMQUnmanagedRegionSHM.cxx @@ -13,7 +13,7 @@ using namespace std; using namespace fair::mq::shmem; -namespace bipc = boost::interprocess; +namespace bipc = ::boost::interprocess; FairMQUnmanagedRegionSHM::FairMQUnmanagedRegionSHM(Manager& manager, const size_t size, FairMQRegionCallback callback) : fManager(manager) diff --git a/fairmq/shmem/Manager.cxx b/fairmq/shmem/Manager.cxx index e85b1020..05f3cf82 100644 --- a/fairmq/shmem/Manager.cxx +++ b/fairmq/shmem/Manager.cxx @@ -9,6 +9,9 @@ #include #include +using namespace std; +namespace bipc = ::boost::interprocess; + namespace fair { namespace mq @@ -16,9 +19,6 @@ namespace mq namespace shmem { -using namespace std; -namespace bipc = boost::interprocess; - std::unordered_map Manager::fRegions; Manager::Manager(const string& name, size_t size) diff --git a/fairmq/shmem/Monitor.cxx b/fairmq/shmem/Monitor.cxx index 4a12ae4b..61c62062 100644 --- a/fairmq/shmem/Monitor.cxx +++ b/fairmq/shmem/Monitor.cxx @@ -26,8 +26,8 @@ #include using namespace std; -namespace bipc = boost::interprocess; -namespace bpt = boost::posix_time; +namespace bipc = ::boost::interprocess; +namespace bpt = ::boost::posix_time; using CharAllocator = bipc::allocator; using String = bipc::basic_string, CharAllocator>; diff --git a/fairmq/shmem/Region.cxx b/fairmq/shmem/Region.cxx index bef91d96..7c9cf17c 100644 --- a/fairmq/shmem/Region.cxx +++ b/fairmq/shmem/Region.cxx @@ -12,6 +12,11 @@ #include +using namespace std; + +namespace bipc = ::boost::interprocess; +namespace bpt = ::boost::posix_time; + namespace fair { namespace mq @@ -19,11 +24,6 @@ namespace mq namespace shmem { -using namespace std; - -namespace bipc = boost::interprocess; -namespace bpt = boost::posix_time; - Region::Region(Manager& manager, uint64_t id, uint64_t size, bool remote, FairMQRegionCallback callback) : fManager(manager) , fRemote(remote)