From a478bb14851d8c30106b20104f7bec9fc86ea124 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Sat, 5 Jan 2019 20:40:45 -0500
Subject: [PATCH] Fix some minor std::function-related bugs.

Lambdas to be stored in `function<void()>` should not return `bool`.

Two uses of `std::function` could be just `function`, like everywhere
else in the codebase.
---
 dialogs.cpp               | 3 +--
 graph.cpp                 | 6 +++---
 rogueviz-banachtarski.cpp | 3 +--
 rogueviz-graph.cpp        | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dialogs.cpp b/dialogs.cpp
index 22678a24..62351463 100644
--- a/dialogs.cpp
+++ b/dialogs.cpp
@@ -473,7 +473,7 @@ namespace dialog {
   
   color_t *colorPointer;
   
-  bool handleKeyColor(int sym, int uni) {
+  void handleKeyColor(int sym, int uni) {
     unsigned& color = *colorPointer;
     int shift = colorAlpha ? 0 : 8;
 
@@ -514,7 +514,6 @@ namespace dialog {
     else if(doexiton(sym, uni)) {
       popScreen();
       }
-    return false;
     }
   
   bool colorAlpha;
diff --git a/graph.cpp b/graph.cpp
index 11b50b42..e47d3c97 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -1870,9 +1870,9 @@ int taildist(cell *c) {
   }
 
 int last_wormsegment = -1;
-vector<vector< std::function<void()> > > wormsegments;
+vector<vector< function<void()> > > wormsegments;
 
-void add_segment(int d, const std::function<void()>& s) {
+void add_segment(int d, const function<void()>& s) {
   if(isize(wormsegments) <= d) wormsegments.resize(d+1);
   last_wormsegment = max(last_wormsegment, d);
   wormsegments[d].push_back(s);
@@ -5778,7 +5778,7 @@ void drawscreen() {
   mouseovers = " ";
 
   cmode = 0;
-  keyhandler = [] (int sym, int uni) { return false; };
+  keyhandler = [] (int sym, int uni) {};
   #if CAP_SDL
   joyhandler = [] (SDL_Event& ev) { return false; };
   #endif
diff --git a/rogueviz-banachtarski.cpp b/rogueviz-banachtarski.cpp
index d101a0c7..bcb1fefd 100644
--- a/rogueviz-banachtarski.cpp
+++ b/rogueviz-banachtarski.cpp
@@ -442,7 +442,7 @@ void bantar_anim() {
 
 bool bmap;
 
-bool bantar_stats() {
+void bantar_stats() {
   if(bmap) {
     vid.linewidth *= (inHighQual ? 10 : 2);
     for(auto p: parent) if(gmatrix.count(p.first) && gmatrix.count(p.second))
@@ -458,7 +458,6 @@ bool bantar_stats() {
     vid.linewidth /= (inHighQual ? 10 : 2);
     drawqueue();
     }
-  return false;
   }
 
 void init_bantar() {
diff --git a/rogueviz-graph.cpp b/rogueviz-graph.cpp
index 881134bb..984bd1d8 100644
--- a/rogueviz-graph.cpp
+++ b/rogueviz-graph.cpp
@@ -389,7 +389,7 @@ void show_graph() {
     };
   }
 
-bool frame() { 
+void frame() { 
   if(graphcolor) {
     hyperpoint h0 = find_point(0);
     hyperpoint h1 = find_point(1);
@@ -397,7 +397,6 @@ bool frame() {
     draw_to(0, h0, 1, h1);
     finish();
     }
-  return false;
   }
 
 #if CAP_COMMANDLINE