From e340a52bf243e7ada3c57b0e732d9af08b206f7c Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Mon, 4 Dec 2017 13:00:45 +0100 Subject: [PATCH] Use FairMQ tools for string creation. --- fairmq/FairMQDevice.cxx | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx index a319f28a..792946fc 100644 --- a/fairmq/FairMQDevice.cxx +++ b/fairmq/FairMQDevice.cxx @@ -14,7 +14,6 @@ #include #include #include -#include #include // join/split @@ -403,10 +402,7 @@ bool FairMQDevice::BindEndpoint(FairMQSocket& socket, string& endpoint) } size_t pos = endpoint.rfind(":"); - stringstream newPort; - newPort << static_cast(randomPort(generator)); - // TODO: thread safety? (this comes in as a reference and DOES get changed in this case). - endpoint = endpoint.substr(0, pos + 1) + newPort.str(); + endpoint = endpoint.substr(0, pos + 1) + fair::mq::tools::ToString(static_cast(randomPort(generator))); } return true; @@ -441,9 +437,7 @@ void FairMQDevice::SortChannel(const string& name, const bool reindex) for (auto vi = fChannels.at(name).begin(); vi != fChannels.at(name).end(); ++vi) { // set channel name: name + vector index - stringstream ss; - ss << name << "[" << vi - fChannels.at(name).begin() << "]"; - vi->fName = ss.str(); + vi->fName = fair::mq::tools::ToString(name, "[", vi - fChannels.at(name).begin(), "]"); } } } @@ -930,9 +924,7 @@ void FairMQDevice::LogSocketRates() filteredSockets.push_back(vi->fSocket.get()); logIntervals.push_back(vi->fRateLogging); intervalCounters.push_back(0); - stringstream ss; - ss << mi.first << "[" << vi - (mi.second).begin() << "]"; - filteredChannelNames.push_back(ss.str()); + filteredChannelNames.push_back(fair::mq::tools::ToString(mi.first, "[", vi - (mi.second).begin(), "]")); } } }