Skip to content

Commit d05475f

Browse files
Fix plotjuggler line endings
1 parent 94d03dd commit d05475f

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

patch/ros-jazzy-plotjuggler.patch

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -609,18 +609,18 @@ index 0bb68ebe..20855338 100644
609609
--- a/3rdparty/sol/sol.hpp
610610
+++ b/3rdparty/sol/sol.hpp
611611
@@ -6747,12 +6747,9 @@ namespace sol {
612-
/// one.
613-
///
614-
/// \group emplace
615-
- template <class... Args>
616-
- T& emplace(Args&&... args) noexcept {
617-
- static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
618-
-
619-
- *this = nullopt;
620-
- this->construct(std::forward<Args>(args)...);
621-
+ T& emplace(T& arg) noexcept {
622-
+ m_value = &arg;
623-
+ return **this;
624-
}
625-
626-
/// Swaps this optional with the other.
612+
/// one.
613+
///
614+
/// \group emplace
615+
- template <class... Args>
616+
- T& emplace(Args&&... args) noexcept {
617+
- static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
618+
-
619+
- *this = nullopt;
620+
- this->construct(std::forward<Args>(args)...);
621+
+ T& emplace(T& arg) noexcept {
622+
+ m_value = &arg;
623+
+ return **this;
624+
}
625+
626+
/// Swaps this optional with the other.

0 commit comments

Comments
 (0)