update 2geom. big commit as it has been a while. (2geom svn rev. 1870, i think)

i turned some optional compilation stuff *on* per default, to help building inkscape.

(bzr r7638)

2 files changed, 30 insertions, 5 deletions

diff --git a/src/2geom/numeric/fitting-tool.h b/src/2geom/numeric/fitting-tool.h
index 47c588cb2..d6a26bd2d 100644
--- a/src/2geom/numeric/fitting-tool.h
+++ b/src/2geom/numeric/fitting-tool.h
@@ -463,7 +463,17 @@ class least_squeares_fitter<ModelT, double, true>
     typedef typename base_type::solution_type           solution_type;
 
     using base_type::m_vector_view;
-    using base_type::result;
+    //using base_type::result; // VSC legacy support
+    solution_type& result( std::vector<Point> const& old_sample_values,
+                           std::vector<Point> const& new_sample_values )
+    {
+        return base_type::result(old_sample_values, new_sample_values);
+    }
+ 
+    solution_type& result()
+    {
+        return base_type::result();
+    }
 
   public:
     least_squeares_fitter<ModelT, double, true>( model_type const& _model,
@@ -497,7 +507,18 @@ class least_squeares_fitter<ModelT, Point, true>
     typedef typename base_type::solution_type           solution_type;
 
     using base_type::m_vector_view;
-    using base_type::result;
+    //using base_type::result; // VCS legacy support
+    solution_type& result( std::vector<Point> const& old_sample_values,
+                           std::vector<Point> const& new_sample_values )
+    {
+        return base_type::result(old_sample_values, new_sample_values);
+    }
+ 
+    solution_type& result()
+    {
+        return base_type::result();
+    }
+
 
   public:
     least_squeares_fitter<ModelT, Point, true>( model_type const& _model,
diff --git a/src/2geom/numeric/matrix.h b/src/2geom/numeric/matrix.h
index e9b6e6e9e..97db59d56 100644
--- a/src/2geom/numeric/matrix.h
+++ b/src/2geom/numeric/matrix.h
@@ -232,11 +232,15 @@ class MatrixImpl : public BaseMatrixImpl
 		gsl_matrix_set_identity(m_matrix);
 	}
 
-	using base_type::operator();
+        using base_type::operator(); // VSC legacy support
+        const double & operator() (size_t i, size_t j) const
+        {
+            return base_type::operator ()(i, j);
+        }
 
-	double & operator() (size_t i, size_t j)
+        double & operator() (size_t i, size_t j)
 	{
-		return *gsl_matrix_ptr(m_matrix, i, j);
+            return *gsl_matrix_ptr(m_matrix, i, j);
 	}
 
 	using base_type::get_gsl_matrix;