Merge branch 'mat_fix' of git.sourceforge.jp:/gitroot/moflib/moflib

[moflib/moflib.git] / src / mof / math / matrix2.hpp

diff --git a/src/mof/math/matrix2.hpp b/src/mof/math/matrix2.hpp
index cdd1f7e..89ebfef 100644 (file)
--- a/src/mof/math/matrix2.hpp
+++ b/src/mof/math/matrix2.hpp
@@ -72,8 +72,13 @@ namespace math
 //{{{ operator =
        matrix2& operator = (const matrix2& rhs)
        {
+<<<<<<< HEAD
+               for (size_t i = 0; i <= last_index() - 1; ++i) {
+                       elements_[i] = rhs.elements_[i];
+=======
                for (size_t i = 0; i <= last_index(); ++i) {
                        components_[i] = rhs.components_[i];
+>>>>>>> b5b23396b7e7f34fc19daa767a3cbdad95673d24
                }
                return *this;
        }