-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patch for MSVC2022 compilation and bump port-version
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
- Loading branch information
Showing
3 changed files
with
30 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
Title: Fix compilation with MSVC 2022 | ||
Source: Michael Carroll <mjcarroll@intrinsic.ai> | ||
Description: Patch type to make MSVC2022 to be able to compile | ||
|
||
--- | ||
diff --git a/dart/common/detail/Signal.hpp b/dart/common/detail/Signal.hpp | ||
index b7a6744d8ed1..844952e27bdd 100644 | ||
--- a/dart/common/detail/Signal.hpp | ||
+++ b/dart/common/detail/Signal.hpp | ||
@@ -84,7 +84,7 @@ void Signal<_Res(_ArgTypes...), Combiner>::disconnect( | ||
//============================================================================== | ||
template <typename _Res, typename... _ArgTypes, template <class> class Combiner> | ||
void Signal<_Res(_ArgTypes...), Combiner>::disconnect( | ||
- const std::shared_ptr<Signal::ConnectionBodyType>& connectionBody) | ||
+ const std::shared_ptr<ConnectionBodyType>& connectionBody) | ||
{ | ||
mConnectionBodies.erase(connectionBody); | ||
} | ||
@@ -179,7 +179,7 @@ void Signal<void(_ArgTypes...)>::disconnect(const Connection& connection) const | ||
//============================================================================== | ||
template <typename... _ArgTypes> | ||
void Signal<void(_ArgTypes...)>::disconnect( | ||
- const std::shared_ptr<Signal::ConnectionBodyType>& connectionBody) | ||
+ const std::shared_ptr<ConnectionBodyType>& connectionBody) | ||
{ | ||
mConnectionBodies.erase(connectionBody); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters