Fix compilation errors with GCC 7.3 (8e40ec6b) · Commits · hpc / norns

configure.ac

+0 −8

Original line number	Diff line number	Diff line
		@@ -77,14 +77,6 @@ AX_BOOST_PROGRAM_OPTIONS
		AX_BOOST_THREAD


		# check that Intel's TBB is available. some distros don't include
		PKG_CHECK_MODULES([TBB], [tbb],
		[],
		AC_MSG_ERROR([This software requires the development files of Intel TBB.
		* In Ubuntu/Debian: apt-get install libtbb-dev
		* In RHEL/CentOS: yum install tbb-devel])
		)

		# check for protobuf-c
		PKG_CHECK_MODULES([PROTOBUF_C], [libprotobuf-c >= 1.0.0])

m4/ax_boost_thread.m4

0 → 100644

+163 −0

Original line number	Diff line number	Diff line
		# ===========================================================================
		# https://www.gnu.org/software/autoconf-archive/ax_boost_thread.html
		# ===========================================================================
		#
		# SYNOPSIS
		#
		# AX_BOOST_THREAD
		#
		# DESCRIPTION
		#
		# Test for Thread library from the Boost C++ libraries. The macro requires
		# a preceding call to AX_BOOST_BASE. Further documentation is available at
		# <http://randspringer.de/boost/index.html>.
		#
		# This macro calls:
		#
		# AC_SUBST(BOOST_THREAD_LIB)
		#
		# And sets:
		#
		# HAVE_BOOST_THREAD
		#
		# LICENSE
		#
		# Copyright (c) 2009 Thomas Porschberg <thomas@randspringer.de>
		# Copyright (c) 2009 Michael Tindal
		#
		# Copying and distribution of this file, with or without modification, are
		# permitted in any medium without royalty provided the copyright notice
		# and this notice are preserved. This file is offered as-is, without any
		# warranty.

		#serial 31

		AC_DEFUN([AX_BOOST_THREAD],
		[
		AC_ARG_WITH([boost-thread],
		AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
		[use the Thread library from boost -
		it is possible to specify a certain library for the linker
		e.g. --with-boost-thread=boost_thread-gcc-mt ]),
		[
		if test "$withval" = "yes"; then
		want_boost="yes"
		ax_boost_user_thread_lib=""
		else
		want_boost="yes"
		ax_boost_user_thread_lib="$withval"
		fi
		],
		[want_boost="yes"]
		)

		if test "x$want_boost" = "xyes"; then
		AC_REQUIRE([AC_PROG_CC])
		AC_REQUIRE([AC_CANONICAL_BUILD])
		CPPFLAGS_SAVED="$CPPFLAGS"
		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
		export CPPFLAGS

		LDFLAGS_SAVED="$LDFLAGS"
		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
		export LDFLAGS

		AC_CACHE_CHECK(whether the Boost::Thread library is available,
		ax_cv_boost_thread,
		[AC_LANG_PUSH([C++])
		CXXFLAGS_SAVE=$CXXFLAGS

		if test "x$host_os" = "xsolaris" ; then
		CXXFLAGS="-pthreads $CXXFLAGS"
		elif test "x$host_os" = "xmingw32" ; then
		CXXFLAGS="-mthreads $CXXFLAGS"
		else
		CXXFLAGS="-pthread $CXXFLAGS"
		fi
		AC_COMPILE_IFELSE([
		AC_LANG_PROGRAM(
		[[@%:@include <boost/thread/thread.hpp>]],
		[[boost::thread_group thrds;
		return 0;]])],
		ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
		CXXFLAGS=$CXXFLAGS_SAVE
		AC_LANG_POP([C++])
		])
		if test "x$ax_cv_boost_thread" = "xyes"; then
		if test "x$host_os" = "xsolaris" ; then
		BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS"
		elif test "x$host_os" = "xmingw32" ; then
		BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS"
		else
		BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS"
		fi

		AC_SUBST(BOOST_CPPFLAGS)

		AC_DEFINE(HAVE_BOOST_THREAD,,
		[define if the Boost::Thread library is available])
		BOOSTLIBDIR=`echo $BOOST_LDFLAGS \| sed -e 's/@<:@^\/@:>@*//'`

		LDFLAGS_SAVE=$LDFLAGS
		case "x$host_os" in
		bsd )
		LDFLAGS="-pthread $LDFLAGS"
		break;
		;;
		esac
		if test "x$ax_boost_user_thread_lib" = "x"; then
		for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null \| sed 's,./lib,,' \| sed 's,\..,,'`; do
		ax_lib=${libextension}
		AC_CHECK_LIB($ax_lib, exit,
		[link_thread="yes"; break],
		[link_thread="no"])
		done
		if test "x$link_thread" != "xyes"; then
		for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null \| sed 's,./,,' \| sed 's,\..,,'`; do
		ax_lib=${libextension}
		AC_CHECK_LIB($ax_lib, exit,
		[link_thread="yes"; break],
		[link_thread="no"])
		done
		fi

		else
		for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do
		AC_CHECK_LIB($ax_lib, exit,
		[link_thread="yes"; break],
		[link_thread="no"])
		done

		fi
		if test "x$ax_lib" = "x"; then
		AC_MSG_ERROR(Could not find a version of the library!)
		fi
		if test "x$link_thread" = "xno"; then
		AC_MSG_ERROR(Could not link against $ax_lib !)
		else
		BOOST_THREAD_LIB="-l$ax_lib"
		case "x$host_os" in
		bsd )
		BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
		break;
		;;
		xsolaris )
		BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread"
		break;
		;;
		xmingw32 )
		break;
		;;
		* )
		BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread"
		break;
		;;
		esac
		AC_SUBST(BOOST_THREAD_LIB)
		fi
		fi

		CPPFLAGS="$CPPFLAGS_SAVED"
		LDFLAGS="$LDFLAGS_SAVED"
		fi
		])

src/Makefile.am

+0 −2

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ nodist_liburd_aux_la_SOURCES = \
		messages.pb.h

		liburd_aux_la_CXXFLAGS = \
		@TBB_CFLAGS@ \
		-std=gnu++11 -Wall -Wextra

		liburd_aux_la_CPPFLAGS = \
		@@ -235,7 +234,6 @@ urd_SOURCES = \
		main.cpp

		urd_CXXFLAGS = \
		@TBB_CFLAGS@ \
		-std=gnu++11 -Wall -Wextra

		urd_CPPFLAGS = \

src/api/message.hpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <norns-rpc.h>
		#include <arpa/inet.h>
		#include <iomanip>
		#include <iostream> // for print_hex, XXX remove if not needed

		namespace {

src/settings.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		* <http://www.gnu.org/licenses/>. *
		*************************************************************************/

		#include <iostream>
		#include <boost/foreach.hpp>
		#include <boost/property_tree/ptree.hpp>
		#include <boost/property_tree/json_parser.hpp>