Commit 11647020 authored by Ilya Leoshkevich's avatar Ilya Leoshkevich

configure.ac: save and restore CFLAGS, Makefile.am: nobase_include, more flags

parent 0195a6e9
...@@ -51,7 +51,7 @@ libcppa_la_SOURCES = \ ...@@ -51,7 +51,7 @@ libcppa_la_SOURCES = \
src/yielding_message_queue.cpp \ src/yielding_message_queue.cpp \
src/yield_interface.cpp src/yield_interface.cpp
include_HEADERS = \ nobase_include_HEADERS = \
cppa/actor_behavior.hpp \ cppa/actor_behavior.hpp \
cppa/actor.hpp \ cppa/actor.hpp \
cppa/actor_proxy.hpp \ cppa/actor_proxy.hpp \
...@@ -187,4 +187,5 @@ include_HEADERS = \ ...@@ -187,4 +187,5 @@ include_HEADERS = \
cppa/util/void_type.hpp \ cppa/util/void_type.hpp \
cppa/util/wrapped.hpp cppa/util/wrapped.hpp
libcppa_la_CXXFLAGS = -Werror --std=c++0x libcppa_la_CXXFLAGS = --std=c++0x -pedantic -Wall -Wextra -Werror
libcppa_la_LDFLAGS = -lboost_thread
...@@ -5,7 +5,8 @@ AC_PROG_CXX ...@@ -5,7 +5,8 @@ AC_PROG_CXX
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_LANG([C++]) AC_LANG([C++])
CPPFLAGS="-Werror --std=c++0x" ORIGINAL_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -Werror --std=c++0x"
AC_CACHE_CHECK( AC_CACHE_CHECK(
[whether C++ compiler supports variadic templates], [whether C++ compiler supports variadic templates],
...@@ -27,5 +28,8 @@ AS_IF( ...@@ -27,5 +28,8 @@ AS_IF(
[], [],
[AC_MSG_ERROR([at least one required C++ compiler feature is not supported])]) [AC_MSG_ERROR([at least one required C++ compiler feature is not supported])])
CPPFLAGS="$ORIGINAL_CPPFLAGS"
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT
...@@ -126,7 +126,7 @@ void mailman_loop() ...@@ -126,7 +126,7 @@ void mailman_loop()
// disconnect peer if send() failed // disconnect peer if send() failed
disconnect_peer = (sent <= 0); disconnect_peer = (sent <= 0);
// make sure all bytes are written // make sure all bytes are written
if (sent != size32) if (static_cast<std::uint32_t>(sent) != size32)
{ {
throw std::logic_error("send() not a synchronous socket"); throw std::logic_error("send() not a synchronous socket");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment