aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-01-17 10:32:46 -0500
committerJack Lloyd <[email protected]>2016-01-17 10:32:46 -0500
commitde22a9eda8bfb087b690feb962fae8313ee526d4 (patch)
tree82e01fc9802b842f7b5d187ed9de6e554825cd42
parente49059e05bca0d1f9e164481eb41b5bd212aeae9 (diff)
parent09365199f758110a96c538d04c2f8ff90b9b86b6 (diff)
Merge GH #410 enable -Wpedantic
-rw-r--r--src/build-data/cc/clang.txt2
-rw-r--r--src/build-data/cc/gcc.txt2
-rw-r--r--src/tests/unit_tls.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 3382f5d65..a00230e7a 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -10,7 +10,7 @@ add_framework_option "-framework "
lang_flags "-std=c++11 -D_REENTRANT -fstack-protector"
-warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wunreachable-code"
+warning_flags "-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wunreachable-code"
maintainer_warning_flags "-Qunused-arguments -Werror -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=unreachable-code"
compile_flags "-c"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index b00f8bd31..634b9e751 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -9,7 +9,7 @@ add_lib_option -l
lang_flags "-std=c++11 -D_REENTRANT"
maintainer_warning_flags "-Wold-style-cast -Werror -Wno-error=old-style-cast -Wno-error=zero-as-null-pointer-constant -Wno-error=unused-parameter -Wno-error=unused-variable -Wno-error=strict-overflow -Wsuggest-override -Wsuggest-attribute=noreturn"
-warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor"
+warning_flags "-Wall -Wextra -Wpedantic -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wzero-as-null-pointer-constant -Wnon-virtual-dtor"
compile_flags "-c"
debug_info_flags "-g"
diff --git a/src/tests/unit_tls.cpp b/src/tests/unit_tls.cpp
index 3996b36b0..0fa208858 100644
--- a/src/tests/unit_tls.cpp
+++ b/src/tests/unit_tls.cpp
@@ -163,7 +163,7 @@ std::function<void (const byte[], size_t)> queue_inserter(std::vector<byte>& q)
void print_alert(Botan::TLS::Alert, const byte[], size_t)
{
- };
+ }
Test::Result test_tls_handshake(Botan::TLS::Protocol_Version offer_version,
Botan::Credentials_Manager& creds,