Fixes for g++-6

thepluck · Mar 25, 2017 · 439d9f2 · 439d9f2
1 parent 6d2b968
commit 439d9f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/generic_graph.h b/generic_graph.h
@@ -109,7 +109,7 @@ class GenericGraph {
 
     // v: edge number
     // returns: edge number
-    int edgeOtherEnd(int v, int edgeId);
+    int edgeOtherEnd(int v, int edgeId) const;
 
     void permuteEdges(const Array& order);
 
@@ -196,7 +196,7 @@ void GenericGraph::addEdgeUnsafe(int u, int v) {
     }
 }
 
-int GenericGraph::edgeOtherEnd(int v, int edgeId) {
+int GenericGraph::edgeOtherEnd(int v, int edgeId) const {
     ENSURE(edgeId < numEdges_);
     const auto& edge = edges_[edgeId];
     if (edge.first == v) {

diff --git a/jngen.h b/jngen.h
@@ -2914,7 +2914,7 @@ class VariantImpl<Size, T, Args...> : public VariantImpl<
 {
     using Base = VariantImpl<(sizeof(T) > Size ? sizeof(T) : Size), Args...>;
 
-    constexpr static size_t MY_ID = sizeof...(Args);
+    constexpr static int MY_ID = sizeof...(Args);
 
 protected:
     void doDestroy() {
@@ -3323,7 +3323,7 @@ class GenericGraph {
 
     // v: edge number
     // returns: edge number
-    int edgeOtherEnd(int v, int edgeId);
+    int edgeOtherEnd(int v, int edgeId) const;
 
     void permuteEdges(const Array& order);
 
@@ -3410,7 +3410,7 @@ void GenericGraph::addEdgeUnsafe(int u, int v) {
     }
 }
 
-int GenericGraph::edgeOtherEnd(int v, int edgeId) {
+int GenericGraph::edgeOtherEnd(int v, int edgeId) const {
     ENSURE(edgeId < numEdges_);
     const auto& edge = edges_[edgeId];
     if (edge.first == v) {

diff --git a/variant.h b/variant.h
@@ -78,7 +78,7 @@ class VariantImpl<Size, T, Args...> : public VariantImpl<
 {
     using Base = VariantImpl<(sizeof(T) > Size ? sizeof(T) : Size), Args...>;
 
-    constexpr static size_t MY_ID = sizeof...(Args);
+    constexpr static int MY_ID = sizeof...(Args);
 
 protected:
     void doDestroy() {