-
Notifications
You must be signed in to change notification settings - Fork 38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix Windows MSVC Build Errors #533
Fix Windows MSVC Build Errors #533
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #533 +/- ##
==========================================
- Coverage 84.49% 84.47% -0.02%
==========================================
Files 233 233
Lines 15864 15861 -3
==========================================
- Hits 13404 13399 -5
- Misses 2460 2462 +2 |
@Levi-Armstrong can you clean up the code quality warnings and merge? The error on Windows is just caused by trajopt_ifopt being missing. |
3963e67
to
2be67c3
Compare
getDotgraph(const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map = {}) const; | ||
std::string getDotgraph(const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map) const; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we not keep the default?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MSVC didn't like the = {}
default. My recommendation is create an overload if you want the option to omit that parameter.
/** | ||
* @brief dump the task to dot | ||
* @brief Return additional subgraphs which should get appended if needed | ||
*/ | ||
virtual std::string dump(std::ostream& os) const; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added the overload to fix the default parameter MSVC didn't like.
@@ -33,12 +33,12 @@ TESSERACT_COMMON_IGNORE_WARNINGS_PUSH | |||
TESSERACT_COMMON_IGNORE_WARNINGS_POP | |||
|
|||
#include <tesseract_task_composer/core/task_composer_graph.h> | |||
#include <tesseract_task_composer/core/task_composer_node_info.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I this necessary? Forward declaration should be good because it is only used in a return type.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MSVC seems to have a slightly different method to handle std::unique_ptr that needs the full definition. Otherwise I get a "cannot delete incomplete type" build error.
...eract_task_composer/core/include/tesseract_task_composer/core/task_composer_plugin_factory.h
Outdated
Show resolved
Hide resolved
|
||
/** @brief Generate the Dotgraph and save to file */ | ||
bool saveDotgraph(const std::string& filepath, | ||
const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map = {}) const; | ||
const std::map<boost::uuids::uuid, std::unique_ptr<TaskComposerNodeInfo>>& results_map) const; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MSVC doesn't like = {}
defaults.
I need a version tag with these changes to finish the Python release. |
It looks like the windows CI is not passing; should it be? |
I will work on this over the weekend. |
The failing test on Windows is caused by trajopt_ifopt not being built. tesseract-robotics/trajopt#431 will fix this but it is going to need more work. |
@johnwason I ported most of these change in #541 but need help tracking down the remaining build issues. |
Addressed by #542 |
No description provided.