From 466c8c59a0e968b9bcdc0c32f65cf915e936e21f Mon Sep 17 00:00:00 2001
From: arvidn <arvid@cs.umu.se>
Date: Fri, 21 Aug 2015 00:26:11 +0200
Subject: [PATCH] actually enable warnings on travis and fix command line
 warnings

---
 .travis.yml | 8 ++++----
 Jamfile     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3589bdfbc..014518cb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,15 +46,15 @@ install:
 
 script:
   - cd test
-  - bjam --hash -j3 variant=$variant warnings=off -l900 $CC
+  - bjam --hash -j3 variant=$variant -l900 $CC
   - cd ../examples
-  - bjam --hash -j3 variant=$variant warnings=off $CC
+  - bjam --hash -j3 variant=$variant $CC
   - cd ../bindings/python
-  - bjam --hash -j3 variant=$variant warnings=off $CC stage_module
+  - bjam --hash -j3 variant=$variant $CC stage_module
   - LD_LIBRARY_PATH=. python test.py
   - if [ $sim ]; then
     cd ../../simulation;
-    bjam --hash -j3 crypto=built-in warnings=off $CC;
+    bjam --hash -j3 crypto=built-in $CC;
     fi
   - ccache --show-stats
 
diff --git a/Jamfile b/Jamfile
index 72806c5eb..742a76009 100644
--- a/Jamfile
+++ b/Jamfile
@@ -268,10 +268,10 @@ rule warnings ( properties * )
 	{
 		result += <cflags>-Weverything ;
 		result += <cflags>-Wno-documentation ;
-		result += <cflags>-Wno-c++98-compat-pedantic ;
+		result += <cxxflags>-Wno-c++98-compat-pedantic ;
 		result += <cflags>-Wno-padded ;
 		result += <cflags>-Wno-global-constructors ;
-		result += <cflags>-Wno-c++98-compat ;
+		result += <cxxflags>-Wno-c++98-compat ;
 		result += <cflags>-Wno-exit-time-destructors ;
 		result += <cflags>-Wno-documentation-unknown-command ;
 		result += <cflags>-Wno-disabled-macro-expansion ;
@@ -295,7 +295,7 @@ rule warnings ( properties * )
 #		result += <cflags>-Wmisleading-indentation ;
 		result += <cflags>-Wparentheses ;
 		result += <cflags>-Wvla ;
-		result += <cflags>-Wc++11-compat ;
+		result += <cxxflags>-Wc++11-compat ;
 
 		result += <cflags>-Wno-format-zero-length ;