[Pkg-voip-commits] [bctoolbox] 02/57: Stricter compilation options + new compilation error fixes.

[daniel at gnoutcheff.name]

This is an automated email from the git hooks/post-receive script.

gnoutchd-guest pushed a commit to branch debian/sid
in repository bctoolbox.

commit 97920178d8671174391c923f23bf01b82dc2291b
Author: Ghislain MARY <ghislain.mary at belledonne-communications.com>
Date:   Wed Oct 19 17:21:23 2016 +0200

    Stricter compilation options + new compilation error fixes.
---
 CMakeLists.txt          | 4 ++--
 configure.ac            | 2 +-
 include/bctoolbox/map.h | 2 +-
 src/containers/map.cc   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b03d049..58cafb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,8 +168,8 @@ else()
 		list(APPEND STRICT_OPTIONS_CPP "-Wno-error=unknown-warning-option" "-Qunused-arguments" "-Wno-tautological-compare" "-Wno-unused-function" "-Wno-array-bounds")
 	endif()
 	if(ENABLE_STRICT)
-		list(APPEND STRICT_OPTIONS_CPP "-Werror" "-Wno-error=unknown-pragmas" "-Wuninitialized" "-fno-strict-aliasing")
-		list(APPEND STRICT_OPTIONS_C "-Werror -Wdeclaration-after-statement" "-Wstrict-prototypes" "-Wno-error=strict-prototypes")
+		list(APPEND STRICT_OPTIONS_CPP "-Werror" "-Wextra" "-Wno-unused-parameter" "-Wno-error=unknown-pragmas" "-Wuninitialized" "-fno-strict-aliasing")
+		list(APPEND STRICT_OPTIONS_C "-Wdeclaration-after-statement" "-Wstrict-prototypes")
 	endif()
 endif()
 if(STRICT_OPTIONS_CPP)
diff --git a/configure.ac b/configure.ac
index 70b4cfc..d250b15 100755
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ AC_ARG_ENABLE(strict,
 STRICT_OPTIONS="-Wall"
 
 if test "$strict" = "true" ; then
-	STRICT_OPTIONS="$STRICT_OPTIONS -Werror"
+	STRICT_OPTIONS="$STRICT_OPTIONS -Werror -Wextra -Wno-unused-parameter"
 fi
 AC_SUBST(STRICT_OPTIONS)
 
diff --git a/include/bctoolbox/map.h b/include/bctoolbox/map.h
index c706cf2..4fcf99a 100644
--- a/include/bctoolbox/map.h
+++ b/include/bctoolbox/map.h
@@ -69,7 +69,7 @@ typedef struct _bctbx_pair_ullong_t bctbx_pair_ullong_t; /*inherite from bctbx_p
 BCTBX_PUBLIC bctbx_pair_ullong_t * bctbx_pair_ullong_new(unsigned long long key,void *value);
 
 BCTBX_PUBLIC void* bctbx_pair_get_second(const bctbx_pair_t * pair);
-BCTBX_PUBLIC const unsigned long long bctbx_pair_ullong_get_first(const bctbx_pair_ullong_t * pair);
+BCTBX_PUBLIC unsigned long long bctbx_pair_ullong_get_first(const bctbx_pair_ullong_t * pair);
 BCTBX_PUBLIC void bctbx_pair_delete(bctbx_pair_t * pair);
 
 
diff --git a/src/containers/map.cc b/src/containers/map.cc
index 1ce2de9..07bb246 100644
--- a/src/containers/map.cc
+++ b/src/containers/map.cc
@@ -71,7 +71,7 @@ extern "C" bctbx_iterator_t *bctbx_map_erase(bctbx_map_t *map,bctbx_iterator_t *
 extern "C" bctbx_iterator_t *bctbx_map_begin(const bctbx_map_t *map) {
 	return (bctbx_iterator_t *) new mmap_ullong_t::iterator(((mmap_ullong_t *)map)->begin());
 }
-extern "C"  bctbx_iterator_t * bctbx_map_end(const bctbx_map_t *map) {
+extern "C" bctbx_iterator_t * bctbx_map_end(const bctbx_map_t *map) {
 	return (bctbx_iterator_t *) new mmap_ullong_t::iterator(((mmap_ullong_t *)map)->end());
 }
 /*iterator*/
@@ -82,7 +82,7 @@ extern "C" bctbx_iterator_t *bctbx_iterator_get_next(bctbx_iterator_t *it) {
 	((mmap_ullong_t::iterator*)it)->operator++();
 	return it;
 }
-extern "C"  bctbx_iterator_t *bctbx_iterator_get_next_and_delete(bctbx_iterator_t *it) {
+extern "C" bctbx_iterator_t *bctbx_iterator_get_next_and_delete(bctbx_iterator_t *it) {
 	bctbx_iterator_t * next = bctbx_iterator_get_next(it);
 	bctbx_iterator_delete(it);
 	return next;
@@ -99,7 +99,7 @@ extern "C" bctbx_pair_ullong_t * bctbx_pair_ullong_new(unsigned long long key,vo
 	return (bctbx_pair_ullong_t *) new pair_ullong_t(key,value);
 	
 }
-extern "C" const unsigned long long bctbx_pair_ullong_get_first(const bctbx_pair_ullong_t  * pair) {
+extern "C" unsigned long long bctbx_pair_ullong_get_first(const bctbx_pair_ullong_t  * pair) {
 	return ((pair_ullong_t*)pair)->first;
 }
 extern "C" void* bctbx_pair_get_second(const bctbx_pair_t * pair) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bctoolbox.git