Merge branch 'dev-mac' of github.com:pixhawk/qgroundcontrol into dev

14 years ago · 8dadb1a4f7
1 changed files with 6 additions and 1 deletions
--- a/src/uas/UASManager.h
+++ b/src/uas/UASManager.h
@ -224,7 +224,12 @@ signals:
				@@ -224,7 +224,12 @@ signals:
    void activeUASStatusChanged(int systemId, bool active);
    /** @brief Current home position changed */
    void homePositionChanged(double lat, double lon, double alt);
-
+public:
+    /* Need to align struct pointer to prevent a memory assertion:
+     * See http://eigen.tuxfamily.org/dox-devel/TopicUnalignedArrayAssert.html
+     * for details
+     */
+    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 };

 #endif // _UASMANAGER_H_