12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid multiple std::string() calls in toc function

release/4.3a0
Varun Agrawal 2023-03-17 15:50:40 -04:00
parent 1db3cdc780
commit 29b245d1dc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtsam/base/timing.cpp
View File

@ -272,20 +272,21 @@ void tic(size_t id, const char *labelC) {
} }
/* ************************************************************************* */ /* ************************************************************************* */
void toc(size_t id, const char *label) { void toc(size_t id, const char *labelC) {
// disable anything which refers to TimingOutline as well, for good measure // disable anything which refers to TimingOutline as well, for good measure
#ifdef GTSAM_USE_BOOST_FEATURES #ifdef GTSAM_USE_BOOST_FEATURES
const std::string label(labelC);
std::shared_ptr<TimingOutline> current(gCurrentTimer.lock()); std::shared_ptr<TimingOutline> current(gCurrentTimer.lock());
if (id != current->id_) { if (id != current->id_) {
gTimingRoot->print(); gTimingRoot->print();
throw std::invalid_argument( throw std::invalid_argument(
"gtsam timing: Mismatched tic/toc: gttoc(\"" + std::string(label) + "gtsam timing: Mismatched tic/toc: gttoc(\"" + label +
"\") called when last tic was \"" + current->label_ + "\"."); "\") called when last tic was \"" + current->label_ + "\".");
} }
if (!current->parent_.lock()) { if (!current->parent_.lock()) {
gTimingRoot->print(); gTimingRoot->print();
throw std::invalid_argument( throw std::invalid_argument(
"gtsam timing: Mismatched tic/toc: extra gttoc(\"" + std::string(label) + "gtsam timing: Mismatched tic/toc: extra gttoc(\"" + label +
"\"), already at the root"); "\"), already at the root");
} }
current->toc(); current->toc();