Skip to content

Commit 55a2911

Browse files
committed
Fix Windows MSVC Build Errors
1 parent e5f06eb commit 55a2911

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_node.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ class TaskComposerNode
149149

150150
/** @brief Generate the Dotgraph as a string */
151151
std::string
152-
getDotgraph(const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map = {}) const;
152+
getDotgraph(const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map) const;
153153

154154
/** @brief Generate the Dotgraph and save to file */
155155
bool saveDotgraph(const std::string& filepath,
156-
const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map = {}) const;
156+
const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map) const;
157157

158158
/** @brief Rename input keys */
159159
virtual void renameInputKeys(const std::map<std::string, std::string>& input_keys);
@@ -170,8 +170,15 @@ class TaskComposerNode
170170
*/
171171
virtual std::string
172172
dump(std::ostream& os,
173-
const TaskComposerNode* parent = nullptr,
174-
const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map = {}) const;
173+
const TaskComposerNode* parent,
174+
const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map) const;
175+
176+
/**
177+
* @brief dump the task to dot
178+
* @brief Return additional subgraphs which should get appended if needed
179+
*/
180+
virtual std::string
181+
dump(std::ostream& os) const;
175182

176183
bool operator==(const TaskComposerNode& rhs) const;
177184
bool operator!=(const TaskComposerNode& rhs) const;

tesseract_task_composer/core/include/tesseract_task_composer/core/task_composer_pipeline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
3333
TESSERACT_COMMON_IGNORE_WARNINGS_POP
3434

3535
#include <tesseract_task_composer/core/task_composer_graph.h>
36+
#include <tesseract_task_composer/core/task_composer_node_info.h>
3637

3738
namespace tesseract_planning
3839
{
3940
class TaskComposerContext;
4041
class TaskComposerNode;
41-
class TaskComposerNodeInfo;
4242
class TaskComposerExecutor;
4343
class TaskComposerPluginFactory;
4444
/**

tesseract_task_composer/core/src/task_composer_node.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ TESSERACT_COMMON_IGNORE_WARNINGS_PUSH
3131
#include <boost/uuid/uuid_generators.hpp>
3232
#include <boost/uuid/uuid_io.hpp>
3333
#include <boost/uuid/uuid_serialize.hpp>
34+
#include <boost/lexical_cast.hpp>
35+
#include <boost/algorithm/string/replace.hpp>
3436
#include <yaml-cpp/yaml.h>
3537
#include <console_bridge/console.h>
3638
#include <tesseract_common/serialization.h>
@@ -435,6 +437,12 @@ void TaskComposerNode::renameOutputKeys(const std::map<std::string, std::string>
435437

436438
void TaskComposerNode::setConditional(bool enable) { conditional_ = enable; }
437439

440+
std::string
441+
TaskComposerNode::dump(std::ostream& os) const
442+
{
443+
return dump(os, nullptr, {});
444+
}
445+
438446
std::string
439447
TaskComposerNode::dump(std::ostream& os,
440448
const TaskComposerNode* /*parent*/,
@@ -543,18 +551,9 @@ void TaskComposerNode::serialize(Archive& ar, const unsigned int /*version*/)
543551

544552
std::string TaskComposerNode::toString(const boost::uuids::uuid& u, const std::string& prefix)
545553
{
546-
std::string result;
547-
result.reserve(36);
548-
549-
std::size_t i = 0;
550-
for (const auto* it_data = u.begin(); it_data != u.end(); ++it_data, ++i)
551-
{
552-
const size_t hi = ((*it_data) >> 4) & 0x0F;
553-
result += boost::uuids::detail::to_char(hi);
554-
555-
const size_t lo = (*it_data) & 0x0F;
556-
result += boost::uuids::detail::to_char(lo);
557-
}
554+
std::string result = boost::lexical_cast<std::string>(u);
555+
boost::replace_all(result, "-", "");
556+
558557
return (prefix + result);
559558
}
560559

0 commit comments

Comments
 (0)