From 86f21a6d398c5ec7945933c67665a7fd5d583dd3 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Wed, 28 Jan 2009 14:38:02 +0000
Subject: [PATCH] Remove build warnings when building with g++4.3
---
Packets/80221Bundle/MIHPacket.test.cc | 10 +++++-----
Utils/Console/Parse.test.cc | 10 +++++-----
senfscons/SENFSCons.py | 2 ++
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Packets/80221Bundle/MIHPacket.test.cc b/Packets/80221Bundle/MIHPacket.test.cc
index ccb376aa1..80a28c1d3 100644
--- a/Packets/80221Bundle/MIHPacket.test.cc
+++ b/Packets/80221Bundle/MIHPacket.test.cc
@@ -65,10 +65,10 @@ BOOST_AUTO_UNIT_TEST(MIHPacket_create_string)
mihPacket->dst_mihfId().setString( std::string(200, 'x'));
mihPacket.finalizeThis();
- BOOST_CHECK_EQUAL( mihPacket.size(), 8 + 17 + 203);
+ BOOST_CHECK_EQUAL( mihPacket.size(), unsigned(8 + 17 + 203));
BOOST_CHECK_EQUAL( mihPacket->payloadLength(), 17 + 203);
- BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().length(), 200);
- BOOST_CHECK_EQUAL( senf::bytes(mihPacket->dst_mihfId()), 203);
+ BOOST_CHECK_EQUAL( mihPacket->dst_mihfId().length(), 200u);
+ BOOST_CHECK_EQUAL( senf::bytes(mihPacket->dst_mihfId()), 203u);
}
@@ -205,12 +205,12 @@ BOOST_AUTO_UNIT_TEST(MIHPayload_parse)
GenericTLVPacket::Parser tlv1 = *tlv_list_container.begin();
BOOST_CHECK_EQUAL( tlv1.type(), 0x42);
- BOOST_CHECK_EQUAL( tlv1.length(), 0x0a);
+ BOOST_CHECK_EQUAL( tlv1.length(), 0x0au);
BOOST_CHECK_EQUAL( tlv1.value().size(), 0x0a);
GenericTLVPacket::Parser tlv2 = *boost::next(tlv_list_container.begin());
BOOST_CHECK_EQUAL( tlv2.type(), 0x43);
- BOOST_CHECK_EQUAL( tlv2.length(), 0x05);
+ BOOST_CHECK_EQUAL( tlv2.length(), 0x05u);
BOOST_CHECK_EQUAL( tlv2.value().size(), 0x05);
}
diff --git a/Utils/Console/Parse.test.cc b/Utils/Console/Parse.test.cc
index 4570fb0e6..5a2295f3f 100644
--- a/Utils/Console/Parse.test.cc
+++ b/Utils/Console/Parse.test.cc
@@ -227,28 +227,28 @@ BOOST_AUTO_UNIT_TEST(commandParser)
++ args;
BOOST_REQUIRE( args != info.arguments().end() );
- BOOST_REQUIRE_EQUAL( args->size(), 1u );
+ BOOST_REQUIRE_EQUAL( args->size(), 1 );
BOOST_CHECK_EQUAL( args->begin()->value(), tokens[1] );
++ args;
BOOST_REQUIRE( args != info.arguments().end() );
- BOOST_REQUIRE_EQUAL( args->size(), 1u );
+ BOOST_REQUIRE_EQUAL( args->size(), 1 );
BOOST_CHECK_EQUAL( args->begin()->value(), tokens[2] );
++ args;
BOOST_REQUIRE( args != info.arguments().end() );
- BOOST_REQUIRE_EQUAL( args->size(), 8u );
+ BOOST_REQUIRE_EQUAL( args->size(), 8 );
for (unsigned i (0); i<8; ++i)
BOOST_CHECK_EQUAL( args->begin()[i].value(), tokens[4+i] );
++ args;
BOOST_REQUIRE( args != info.arguments().end() );
- BOOST_REQUIRE_EQUAL( args->size(), 1u );
+ BOOST_REQUIRE_EQUAL( args->size(), 1 );
BOOST_CHECK_EQUAL( args->begin()->value(), tokens[13] );
++ args;
BOOST_REQUIRE( args != info.arguments().end() );
- BOOST_REQUIRE_EQUAL( args->size(), 1u );
+ BOOST_REQUIRE_EQUAL( args->size(), 1 );
BOOST_CHECK_EQUAL( args->begin()->value(), tokens[14] );
++ args;
diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index fc8153771..8fd75038d 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -71,6 +71,7 @@ def InitOpts():
opts.Add('CXX', 'C++ compiler to use', 'g++')
opts.Add('EXTRA_DEFINES', 'Additional preprocessor defines', '')
opts.Add('EXTRA_LIBS', 'Additional libraries to link against', '')
+ opts.Add('EXTRA_CCFLAGS', 'Additional compilation parameters', '')
opts.Add(SCons.Options.BoolOption('final','Enable optimization',0))
opts.Add(SCons.Options.BoolOption('debug','Enable debug symbols in binaries',0))
opts.Add(SCons.Options.BoolOption('profile','Enable profiling',0))
@@ -284,6 +285,7 @@ def MakeEnvironment():
env.Append(CPPDEFINES = [ '$EXTRA_DEFINES' ],
LIBS = [ '$EXTRA_LIBS' ],
+ CXXFLAGS = [ '$EXTRA_CCFLAGS' ],
ALLOBJECTS = [])
return env
--
GitLab