Eigen alignment switched off completely for win32

Core/Algorithms/inc/Beam.h

@@ -24,17 +24,21 @@
 
 #include "Macros.h"
 GCC_DIAG_OFF(unused-local-typedefs);
+#ifdef _WIN32
+#define EIGEN_DONT_ALIGN 1
+#endif
 #include <Eigen/Core>
 GCC_DIAG_ON(unused-local-typedefs);
 
 #endif
 
+
 //! Ideal collimated Beam defined by wavelength, direction and intensity.
 
 class BA_CORE_API_ Beam : public IParameterized
 {
  public:
-    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+    //EIGEN_MAKE_ALIGNED_OPERATOR_NEW
     // see http://eigen.tuxfamily.org/dox-devel/group__TopicUnalignedArrayAssert.html
 
     Beam();

Tests/UnitTests/TestCore/BeamTest.h

@@ -28,7 +28,6 @@ BeamTest::~BeamTest()
 
 }
 
-
 TEST_F(BeamTest, BeamInitialState)
 {
     EXPECT_EQ(double(1), emptyBeam.getIntensity());
@@ -39,7 +38,6 @@ TEST_F(BeamTest, BeamInitialState)
     EXPECT_EQ(double(1), emptyBeam.getParameterPool()->getParameter("intensity").getValue() );
 }
 
-#include <iostream>
 
 TEST_F(BeamTest, BeamAssignment)
 {

shared.pri

@@ -190,9 +190,9 @@ QMAKE_CXXFLAGS_DEBUG += -fdiagnostics-show-option # to find out in gcc which opt
 #QMAKE_CXXFLAGS_RELEASE += -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wnoexcept -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-null-sentinel -Wstrict-overflow=5 -Wswitch-default -Wundef -Werror -Wno-unused
 #QMAKE_CXXFLAGS_RELEASE += -pedantic -Wall -Wextra -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Werror -Wno-unused
 
-#win32{
-#QMAKE_CXXFLAGS += -mincoming-stack-boundary=2
-#}
+win32{
+QMAKE_CXXFLAGS += -mincoming-stack-boundary=2
+}
 
 # to compile with GPERFTOOLS support for code profiling
 CONFIG(GPERFTOOLS) {