From f111c8b209d560899f4be994e49478eb659809eb Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Mon, 30 Oct 2017 17:14:32 -0700
Subject: [PATCH] Fix two non-C++11isms when compiling with CAP_ROGUEVIZ.

Generic lambdas are C++14, and since we only have one in the whole codebase,
let's just not do that. (Alternatively, I could replace -std=c++11 in the
makefile with -std=c++14. I'd be okay with that personally.)

"%Ld" is a typo for "%lld".
---
 kohonen.cpp  | 5 +++--
 rogueviz.cpp | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kohonen.cpp b/kohonen.cpp
index 2a4e9d81..342d3067 100644
--- a/kohonen.cpp
+++ b/kohonen.cpp
@@ -607,10 +607,11 @@ void describe(cell *c) {
   help += "parameters:"; for(int k=0; k<cols; k++) help += " " + fts(n->net[k]); 
   help += ", u-matrix = " + fts(n->udist);
   help += "\n";
-  vector<pair<double, int>> v;
+  using Pair = pair<double, int>;
+  vector<Pair> v;
   for(int s=0; s<samples; s++) if(whowon[s] == n) v.emplace_back(vnorm(n->net, data[s].val), s);
   random_shuffle(v.begin(), v.end());
-  sort(v.begin(), v.end(), [] (auto a, auto b) { return a.first < b.first; });
+  sort(v.begin(), v.end(), [] (const Pair& a, const Pair& b) { return a.first < b.first; });
   
   for(int i=0; i<size(v) && i<20; i++) {
     int s = v[i].second;
diff --git a/rogueviz.cpp b/rogueviz.cpp
index c85fc8a7..e4cd72f1 100644
--- a/rogueviz.cpp
+++ b/rogueviz.cpp
@@ -1415,7 +1415,7 @@ void rvvideo(const char *fname) {
         reached = (2*reached-1) / 3;
       else reached *= 2;
       }
-    printf("reached = %Ld\n", reached);
+    printf("reached = %lld\n", reached);
     vector<string> seq;
     while(reached>1) { 
       seq.push_back(llts(reached));