From 4716040703be1ee906439385d20475dcddad5ce3 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <jacob.benoit.1@gmail.com>
Date: Mon, 25 Oct 2010 10:15:22 -0400
Subject: bug #86 : use internal:: namespace instead of ei_ prefix

---
 demos/mandelbrot/mandelbrot.cpp  | 6 +++---
 demos/opengl/gpuhelper.h         | 8 ++++----
 demos/opengl/quaternion_demo.cpp | 2 +-
 demos/opengl/trackball.cpp       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'demos')

diff --git a/demos/mandelbrot/mandelbrot.cpp b/demos/mandelbrot/mandelbrot.cpp
index f89526cf6..91c0b404f 100644
--- a/demos/mandelbrot/mandelbrot.cpp
+++ b/demos/mandelbrot/mandelbrot.cpp
@@ -45,7 +45,7 @@ template<> struct iters_before_test<double> { enum { ret = 16 }; };
 
 template<typename Real> void MandelbrotThread::render(int img_width, int img_height)
 {
-  enum { packetSize = Eigen::ei_packet_traits<Real>::size }; // number of reals in a Packet
+  enum { packetSize = Eigen::internal::packet_traits<Real>::size }; // number of reals in a Packet
   typedef Eigen::Array<Real, packetSize, 1> Packet; // wrap a Packet as a vector
 
   enum { iters_before_test = iters_before_test<Real>::ret };
@@ -163,8 +163,8 @@ void MandelbrotWidget::paintEvent(QPaintEvent *)
               << elapsed << " ms, "
               << speed << " iters/s (max " << max_speed << ")" << std::endl;
     int packetSize = threads[0]->single_precision
-                   ? int(Eigen::ei_packet_traits<float>::size)
-                   : int(Eigen::ei_packet_traits<double>::size);
+                   ? int(Eigen::internal::packet_traits<float>::size)
+                   : int(Eigen::internal::packet_traits<double>::size);
     setWindowTitle(QString("resolution ")+QString::number(xradius*2/width(), 'e', 2)
                   +QString(", %1 iterations per pixel, ").arg(threads[0]->max_iter)
                   +(threads[0]->single_precision ? QString("single ") : QString("double "))
diff --git a/demos/opengl/gpuhelper.h b/demos/opengl/gpuhelper.h
index c7b924b0e..d0fe71bc7 100644
--- a/demos/opengl/gpuhelper.h
+++ b/demos/opengl/gpuhelper.h
@@ -67,7 +67,7 @@ class GpuHelper
 
     template<typename Scalar, typename Derived>
     void loadMatrix(
-        const Eigen::CwiseNullaryOp<Eigen::ei_scalar_identity_op<Scalar>,Derived>&,
+        const Eigen::CwiseNullaryOp<Eigen::internal::scalar_identity_op<Scalar>,Derived>&,
         GLenum matrixTarget);
 
     /** Make the matrix \a matrixTarget the current OpenGL matrix target.
@@ -86,7 +86,7 @@ class GpuHelper
 
     template<typename Scalar, typename Derived>
     void pushMatrix(
-        const Eigen::CwiseNullaryOp<Eigen::ei_scalar_identity_op<Scalar>,Derived>&,
+        const Eigen::CwiseNullaryOp<Eigen::internal::scalar_identity_op<Scalar>,Derived>&,
         GLenum matrixTarget);
 
     /** Push and clone the OpenGL matrix \a matrixTarget
@@ -161,7 +161,7 @@ void GpuHelper::multMatrix(const Matrix<Scalar,4,4, _Flags, 4,4>& mat, GLenum ma
 
 template<typename Scalar, typename Derived>
 void GpuHelper::loadMatrix(
-    const Eigen::CwiseNullaryOp<Eigen::ei_scalar_identity_op<Scalar>,Derived>&,
+    const Eigen::CwiseNullaryOp<Eigen::internal::scalar_identity_op<Scalar>,Derived>&,
     GLenum matrixTarget)
 {
     setMatrixTarget(matrixTarget);
@@ -190,7 +190,7 @@ inline void GpuHelper::pushMatrix(const Matrix<Scalar,4,4, _Flags, 4,4>& mat, GL
 
 template<typename Scalar, typename Derived>
 void GpuHelper::pushMatrix(
-    const Eigen::CwiseNullaryOp<Eigen::ei_scalar_identity_op<Scalar>,Derived>&,
+    const Eigen::CwiseNullaryOp<Eigen::internal::scalar_identity_op<Scalar>,Derived>&,
     GLenum matrixTarget)
 {
     pushMatrix(matrixTarget);
diff --git a/demos/opengl/quaternion_demo.cpp b/demos/opengl/quaternion_demo.cpp
index 9d496f922..899075669 100644
--- a/demos/opengl/quaternion_demo.cpp
+++ b/demos/opengl/quaternion_demo.cpp
@@ -249,7 +249,7 @@ void RenderingWidget::drawScene()
   gpu.drawVector(Vector3f::Zero(), length*Vector3f::UnitZ(), Color(0,0,1,1));
 
   // draw the fractal object
-  float sqrt3 = ei_sqrt(3.);
+  float sqrt3 = internal::sqrt(3.);
   glLightfv(GL_LIGHT0, GL_AMBIENT, Vector4f(0.5,0.5,0.5,1).data());
   glLightfv(GL_LIGHT0, GL_DIFFUSE, Vector4f(0.5,1,0.5,1).data());
   glLightfv(GL_LIGHT0, GL_SPECULAR, Vector4f(1,1,1,1).data());
diff --git a/demos/opengl/trackball.cpp b/demos/opengl/trackball.cpp
index 05e45c1d0..f8da7779a 100644
--- a/demos/opengl/trackball.cpp
+++ b/demos/opengl/trackball.cpp
@@ -38,7 +38,7 @@ void Trackball::track(const Vector2i& point2D)
   {
     Vector3f axis = mLastPoint3D.cross(newPoint3D).normalized();
     float cos_angle = mLastPoint3D.dot(newPoint3D);
-    if ( ei_abs(cos_angle) < 1.0 )
+    if ( internal::abs(cos_angle) < 1.0 )
     {
       float angle = 2. * acos(cos_angle);
       if (mMode==Around)
-- 
cgit v1.2.3