From fd8f075c488b72e722116d5cb5748422b54999be Mon Sep 17 00:00:00 2001
From: Tim Vandermeersch <tim.vandermeersch@gmail.com>
Date: Fri, 23 Jan 2009 01:53:14 +0100
Subject: [PATCH] replace WithAlignedOperatorNew with
 EIGEN_MAKE_ALIGNED_OPERATOR_NEW. This macro is available from version
 Eigen2-beta5 and up.

---
 avogadro/src/mainwindow.cpp      | 4 +++-
 libavogadro/src/camera.cpp       | 4 +++-
 libavogadro/src/python/eigen.cpp | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
index 757da7848..f431280fa 100644
--- a/avogadro/src/mainwindow.cpp
+++ b/avogadro/src/mainwindow.cpp
@@ -115,9 +115,11 @@ using namespace Eigen;
 namespace Avogadro
 {
 
-  class MainWindowPrivate : public Eigen::WithAlignedOperatorNew
+  class MainWindowPrivate
   {
     public:
+//      EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+
       MainWindowPrivate() : molecule( 0 ),
       undoStack( 0 ), toolsFlow( 0 ), toolsLayout( 0 ),
       toolsTab(0),
diff --git a/libavogadro/src/camera.cpp b/libavogadro/src/camera.cpp
index 69d9dd445..cec04549e 100644
--- a/libavogadro/src/camera.cpp
+++ b/libavogadro/src/camera.cpp
@@ -31,9 +31,11 @@ using namespace Eigen;
 
 namespace Avogadro
 {
-  class CameraPrivate : public Eigen::WithAlignedOperatorNew
+  class CameraPrivate
   {
     public:
+      EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+
       CameraPrivate() {};
 
       Eigen::Transform3d modelview, projection;
diff --git a/libavogadro/src/python/eigen.cpp b/libavogadro/src/python/eigen.cpp
index 266883f49..2c93b9237 100644
--- a/libavogadro/src/python/eigen.cpp
+++ b/libavogadro/src/python/eigen.cpp
@@ -445,9 +445,11 @@ template <> struct ScalarTraits<double>
  */
   
 #ifndef WIN32
-class EigenUnitTestHelper : public Eigen::WithAlignedOperatorNew
+class EigenUnitTestHelper
 {
   public:
+    EIGEN_MAKE_ALIGNED_OPERATOR_NEW
+    
     EigenUnitTestHelper() : m_vector3d(Eigen::Vector3d(1., 2., 3.))
     {
     }