summaryrefslogtreecommitdiffstats
path: root/src/2geom/conjugate_gradient.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
committerMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
commit5a4fb2325f60d292b47330f540b26a3279341c90 (patch)
treed2aa7967be25450b83e625025366c618101ae49f /src/2geom/conjugate_gradient.cpp
parentThe Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff)
parentRemove Snap menu item and improve grid menu item text (diff)
downloadinkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz
inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/2geom/conjugate_gradient.cpp')
-rw-r--r--src/2geom/conjugate_gradient.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/2geom/conjugate_gradient.cpp b/src/2geom/conjugate_gradient.cpp
index ae69d5281..588513414 100644
--- a/src/2geom/conjugate_gradient.cpp
+++ b/src/2geom/conjugate_gradient.cpp
@@ -36,6 +36,9 @@
/* lifted wholely from wikipedia. */
+namespace Geom
+{
+
using std::valarray;
static void
@@ -126,6 +129,8 @@ conjugate_gradient(valarray<double> const &A,
// x is solution
}
+} // namespace Geom
+
/*
Local Variables:
mode:c++