summaryrefslogtreecommitdiffstats
path: root/src/2geom/conjugate_gradient.cpp
diff options
context:
space:
mode:
authorSebastian Wüst <sebi@timewaster.de>2013-10-20 15:32:08 +0000
committerSebastian Wüst <sebi@timewaster.de>2013-10-20 15:32:08 +0000
commit82908f949129e1fcbf62002799ee7b1b77986eed (patch)
treec02098dd7720cdf424f2793ecd3ddac2ea86b969 /src/2geom/conjugate_gradient.cpp
parentchanged text (diff)
parentFix build errors with clang 3.3 and c++11 enabled. (diff)
downloadinkscape-82908f949129e1fcbf62002799ee7b1b77986eed.tar.gz
inkscape-82908f949129e1fcbf62002799ee7b1b77986eed.zip
merge from trunk
(bzr r12417.1.24)
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++