Fixed issues due to merge with master

CMakeLists.txt

@@ -46,6 +46,9 @@ if(BUILD_TESTING)
   ament_add_gmock(realtime_box_tests test/realtime_box_tests.cpp)
   target_link_libraries(realtime_box_tests realtime_tools)
 
+  ament_add_gmock(realtime_box_best_effort_tests test/realtime_box_best_effort_tests.cpp)
+  target_link_libraries(realtime_box_best_effort_tests realtime_tools)
+
   ament_add_gmock(realtime_buffer_tests test/realtime_buffer_tests.cpp)
   target_link_libraries(realtime_buffer_tests realtime_tools)
 

include/realtime_tools/realtime_box_best_effort.h

@@ -41,11 +41,11 @@ template <typename T>
 constexpr auto is_ptr_or_smart_ptr = rcpputils::is_pointer<T>::value;
 
 /*!
-    A Box that ensures thread safe access to the boxed contents. 
+    A Box that ensures thread safe access to the boxed contents.
     Access is best effort. If it can not lock it will return.
 
     NOTE about pointers:
-    You can use pointers with this box but the access will be different. 
+    You can use pointers with this box but the access will be different.
     Only use the get/set methods that take function pointer for accessing the internal value.
 */
 template <class T, typename mutex_type = std::mutex>
@@ -115,7 +115,7 @@ class RealtimeBoxBestEffort
     return value_;
   }
   /**
-   * @brief access the content (r) with best effort 
+   * @brief access the content (r) with best effort
    * @return false if the mutex could not be locked
    * @note only safe way to access pointer type content (r)
   */

test/realtime_box_best_effort_tests.cpp

@@ -114,7 +114,7 @@ TEST(RealtimeBoxBestEffort, assignment_operator)
   DefaultConstructable data;
   data.a = 1000;
   RealtimeBoxBestEffort<DefaultConstructable> box;
-  //Assignement operator is always non RT!
+  //Assignment operator is always non RT!
   box = data;
 
   auto value = box.get();