From 41ab3bd526807e0a092466e7d4e979f12bab81ff Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Tue, 13 May 2014 21:17:06 +0200
Subject: fix windows 64bit build. (changes already committed to trunk)

(bzr r13341.1.19)
---
 src/2geom/toposweep.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/2geom')

diff --git a/src/2geom/toposweep.cpp b/src/2geom/toposweep.cpp
index cfb91857c..4da3f6922 100644
--- a/src/2geom/toposweep.cpp
+++ b/src/2geom/toposweep.cpp
@@ -53,6 +53,7 @@ TopoGraph::Edge TopoGraph::remove_edge(unsigned ix, unsigned jx) {
         }
     }
     assert(0);
+    return v[0]; // if assert is disabled, return first Edge.
 }
 
 void TopoGraph::cannonize() {
-- 
cgit v1.2.3


From 4f98972d426507aaceb1c55d5fdee5b258999445 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Fri, 17 Oct 2014 15:40:53 -0400
Subject: Small warning cleanup

(bzr r13341.1.277)
---
 src/2geom/numeric/symmetric-matrix-fs-operation.h | 2 +-
 src/2geom/numeric/symmetric-matrix-fs-trace.h     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/2geom')

diff --git a/src/2geom/numeric/symmetric-matrix-fs-operation.h b/src/2geom/numeric/symmetric-matrix-fs-operation.h
index 5222d2734..37ece56ae 100644
--- a/src/2geom/numeric/symmetric-matrix-fs-operation.h
+++ b/src/2geom/numeric/symmetric-matrix-fs-operation.h
@@ -44,7 +44,7 @@ namespace Geom { namespace NL {
 
 template <size_t N>
 inline
-SymmetricMatrix<N> adj(const ConstBaseSymmetricMatrix<N> & S)
+SymmetricMatrix<N> adj(const ConstBaseSymmetricMatrix<N> & /*S*/)
 {
     THROW_NOTIMPLEMENTED();
     return SymmetricMatrix<N>();
diff --git a/src/2geom/numeric/symmetric-matrix-fs-trace.h b/src/2geom/numeric/symmetric-matrix-fs-trace.h
index 099c834a8..dbabecf6e 100644
--- a/src/2geom/numeric/symmetric-matrix-fs-trace.h
+++ b/src/2geom/numeric/symmetric-matrix-fs-trace.h
@@ -74,7 +74,7 @@ template <size_t K, size_t N>
 struct trace
 {
     static
-    double evaluate (const ConstBaseSymmetricMatrix<N> & S)
+    double evaluate (const ConstBaseSymmetricMatrix<N> & /*S*/)
     {
         THROW_NOTIMPLEMENTED();
         return K;
-- 
cgit v1.2.3