Merge pull request #2682 from PX4/eigen_upgrade

Upgrade Eigen version
2015-08-15 00:25:35 +02:00 · 2015-08-15 00:25:35 +02:00 · 4466b5680a
parent 9b442fd0cf 698af71482
commit 4466b5680a
3 changed files with 4 additions and 1 deletions
--- a/makefiles/posix/toolchain_native.mk
+++ b/makefiles/posix/toolchain_native.mk
@ -156,7 +156,7 @@ ARCHOPTIMIZATION	 = $(MAXOPTIMIZATION) \
 # Language-specific flags
 #
 ARCHCFLAGS		 = -std=gnu99 -g
-ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=c++0x -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -g
+ARCHCXXFLAGS		 = -fno-exceptions -fno-rtti -std=c++11 -fno-threadsafe-statics -D__CUSTOM_FILE_IO__ -g

 # Generic warnings
 #
--- a/src/lib/px4_eigen.h
+++ b/src/lib/px4_eigen.h
@ -46,6 +46,8 @@
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 #define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC 1

+#define EIGEN_MAX_STATIC_ALIGN_BYTES 16
+
 #include <eigen/Eigen/Core>
 #include <eigen/Eigen/Geometry>
 #pragma GCC diagnostic pop
--- a/src/systemcmds/tests/test_eigen.cpp
+++ b/src/systemcmds/tests/test_eigen.cpp
@ -38,6 +38,7 @@
 * @author Johan Jansen <jnsn.johan@gmail.com>
 */

+#include <cmath>
 #include <px4_eigen.h>
 #include <float.h>
 #include <stdio.h>