From 5508d102fecf31f70c354c4e845861d4b2dd2e56 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Wed, 10 Aug 2016 06:38:46 +0000
Subject: [PATCH] Fix numerous build errors.

Various changes in GCC, clang, and libflex had triggered build failures.
---
 configure.ac         | 15 ++++++++-------
 src/lol/base/array.h |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 32d3224f..ea4f69ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,13 +31,14 @@ AC_TRY_LINK([], [],
   AC_MSG_ERROR([[C++ compiler cannot link executables]])])
 AC_LANG_POP(C++)
 
-dnl  C++11 mode. Checked early so that we don't run into surprises.
-LOL_TRY_CXXFLAGS(-std=c++11,
- [AM_CXXFLAGS="${AM_CXXFLAGS} -std=c++11"
-  CXXFLAGS="${CXXFLAGS} -std=c++11"])
-LOL_TRY_CXXFLAGS(-std=c++0x,
- [AM_CXXFLAGS="${AM_CXXFLAGS} -std=c++0x"
-  CXXFLAGS="${CXXFLAGS} -std=c++0x"])
+dnl  C++11 and later mode. Checked early so that we don't run into surprises.
+version_flag=''
+LOL_TRY_CXXFLAGS(-std=c++0x, [version_flag='-std=c++0x'])
+LOL_TRY_CXXFLAGS(-std=c++11, [version_flag='-std=c++11'])
+LOL_TRY_CXXFLAGS(-std=c++14, [version_flag='-std=c++14'])
+LOL_TRY_CXXFLAGS(-std=c++17, [version_flag='-std=c++17'])
+AM_CXXFLAGS="${AM_CXXFLAGS} ${version_flag}"
+CXXFLAGS="${CXXFLAGS} ${version_flag}"
 
 AC_LANG_PUSH(C++)
 AC_MSG_CHECKING(for C++11 enum class support)
diff --git a/src/lol/base/array.h b/src/lol/base/array.h
index 441281b0..13a7d2c6 100644
--- a/src/lol/base/array.h
+++ b/src/lol/base/array.h
@@ -486,7 +486,7 @@ public:
         {
             tuple<T...> tmp = { args... };
             this->grow();
-            new (&this->m_data[this->m_count].m1) tuple<T...>(tmp);
+            new (&this->m_data[this->m_count]) tuple<T...>(tmp);
         }
         else
         {