From 1928016fe7aa439d4bfb61d3a7e7b7399ca7a229 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Sun, 12 Jul 2009 21:17:25 +0000
Subject: Fix Array's of objects which wrap their C types by value.

---
 libdimensionxx/dimensionxx/geometry.hpp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'libdimensionxx/dimensionxx/geometry.hpp')

diff --git a/libdimensionxx/dimensionxx/geometry.hpp b/libdimensionxx/dimensionxx/geometry.hpp
index 4da6f47..671e204 100644
--- a/libdimensionxx/dimensionxx/geometry.hpp
+++ b/libdimensionxx/dimensionxx/geometry.hpp
@@ -138,17 +138,16 @@ namespace Dimension
 
   template <>
   class Array_Element<Matrix>
-    : public DMNSN_Array_Element<Matrix, dmnsn_matrix>
+    : public By_Value_Array_Element<Matrix, dmnsn_matrix>
   {
   public:
     typedef dmnsn_matrix C_Type;
 
-    Array_Element()
-      : DMNSN_Array_Element<Matrix, dmnsn_matrix>(Matrix()) { }
+    Array_Element() { }
     Array_Element(Matrix& matrix)
-      : DMNSN_Array_Element<Matrix, dmnsn_matrix>(matrix) { }
+      : By_Value_Array_Element<Matrix, dmnsn_matrix>(matrix) { }
     Array_Element(C_Type c)
-      : DMNSN_Array_Element<Matrix, dmnsn_matrix>(c) { }
+      : By_Value_Array_Element<Matrix, dmnsn_matrix>(c) { }
     // Array_Element(const Array_Element& ae);
     // ~Array_Element();
 
@@ -157,17 +156,16 @@ namespace Dimension
 
   template <>
   class Array_Element<Vector>
-    : public DMNSN_Array_Element<Vector, dmnsn_vector>
+    : public By_Value_Array_Element<Vector, dmnsn_vector>
   {
   public:
     typedef dmnsn_vector C_Type;
 
-    Array_Element()
-      : DMNSN_Array_Element<Vector, dmnsn_vector>(Vector()) { }
+    Array_Element() { }
     Array_Element(Vector& vector)
-      : DMNSN_Array_Element<Vector, dmnsn_vector>(vector) { }
+      : By_Value_Array_Element<Vector, dmnsn_vector>(vector) { }
     Array_Element(C_Type c)
-      : DMNSN_Array_Element<Vector, dmnsn_vector>(c) { }
+      : By_Value_Array_Element<Vector, dmnsn_vector>(c) { }
     // Array_Element(const Array_Element& ae);
     // ~Array_Element();
 
@@ -176,17 +174,16 @@ namespace Dimension
 
   template <>
   class Array_Element<Line>
-    : public DMNSN_Array_Element<Line, dmnsn_line>
+    : public By_Value_Array_Element<Line, dmnsn_line>
   {
   public:
     typedef dmnsn_line C_Type;
 
-    Array_Element()
-      : DMNSN_Array_Element<Line, dmnsn_line>(Line()) { }
+    Array_Element() { }
     Array_Element(Line& line)
-      : DMNSN_Array_Element<Line, dmnsn_line>(line) { }
+      : By_Value_Array_Element<Line, dmnsn_line>(line) { }
     Array_Element(C_Type c)
-      : DMNSN_Array_Element<Line, dmnsn_line>(c) { }
+      : By_Value_Array_Element<Line, dmnsn_line>(c) { }
     // Array_Element(const Array_Element& ae);
     // ~Array_Element();
 
-- 
cgit v1.2.3