Explorar el Código

Fix numerous build errors.

Various changes in GCC, clang, and libflex had triggered build failures.
undefined
Sam Hocevar hace 8 años
padre
commit
5508d102fe
Se han modificado 2 ficheros con 9 adiciones y 8 borrados
  1. +8
    -7
      configure.ac
  2. +1
    -1
      src/lol/base/array.h

+ 8
- 7
configure.ac Ver fichero

@@ -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)


+ 1
- 1
src/lol/base/array.h Ver fichero

@@ -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
{


Cargando…
Cancelar
Guardar