Index: /source/ariba/AribaModule.cpp
===================================================================
--- /source/ariba/AribaModule.cpp	(revision 6916)
+++ /source/ariba/AribaModule.cpp	(revision 6919)
@@ -60,5 +60,5 @@
 
 AribaModule::AribaModule()
-	: base_comm(NULL), sideport_sniffer(NULL), started(false) {
+	: started(false), base_comm(NULL), sideport_sniffer(NULL) {
 
 	endpoints = "tcp{41322};rfcomm{10};";
Index: /source/ariba/DataMessage.h
===================================================================
--- /source/ariba/DataMessage.h	(revision 6916)
+++ /source/ariba/DataMessage.h	(revision 6919)
@@ -73,5 +73,5 @@
 
 	inline bool isData() const {
-		return size == ~0;
+		return size == ~(size_t)0;
 	}
 
Index: /source/ariba/Makefile.am
===================================================================
--- /source/ariba/Makefile.am	(revision 6916)
+++ /source/ariba/Makefile.am	(revision 6919)
@@ -22,5 +22,5 @@
 # compiler flags ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-AM_CPPFLAGS     = -DLINUX -D_LINUX -I../ -D_REENTRANT -DSCTP_KERN
+AM_CPPFLAGS    = -DLINUX -D_LINUX -I../ -D_REENTRANT -DSCTP_KERN
 AM_CPPFLAGS    += $(BOOST_CPPFLAGS)
 
Index: /source/ariba/Name.cpp
===================================================================
--- /source/ariba/Name.cpp	(revision 6916)
+++ /source/ariba/Name.cpp	(revision 6919)
@@ -108,4 +108,5 @@
 Name& Name::operator=( const Name& name ) {
 	init((const char*)name.bytes(), name.length(), true, name._hreadable);
+	return *this;
 }
 
@@ -153,5 +154,5 @@
 	if (_hreadable) {
 		char str[256];
-		for (int i=0; i<length(); i++) str[i] = bytes()[i];
+		for (size_t i=0; i<length(); i++) str[i] = bytes()[i];
 		str[length()] = 0;
 		return string(str);
Index: /source/ariba/Name.h
===================================================================
--- /source/ariba/Name.h	(revision 6916)
+++ /source/ariba/Name.h	(revision 6919)
@@ -149,8 +149,8 @@
 
 private:
+	uint8_t* _bytes;
+	int _length;
+	bool _copy;
 	bool _hreadable;
-	bool _copy;
-	int _length;
-	uint8_t* _bytes;
 
 	void init(const char* name, int len, bool copy, bool hreadable);
Index: /source/ariba/Node.cpp
===================================================================
--- /source/ariba/Node.cpp	(revision 6916)
+++ /source/ariba/Node.cpp	(revision 6919)
@@ -48,5 +48,5 @@
 
 Node::Node(AribaModule& ariba_mod, const Name& node_name) :
-	ariba_mod(ariba_mod), name(node_name) {
+	name(node_name), ariba_mod(ariba_mod) {
 	base_overlay = new BaseOverlay();
 }
@@ -164,5 +164,5 @@
 	// now that we have a listener, we can ask if sniffing is ok
 	if( ariba_mod.sideport_sniffer != NULL ){
-		bool allow = listener->onEnableSideportListener();
+//		bool allow = listener->onEnableSideportListener();
 		base_overlay->registerSidePort(ariba_mod.sideport_sniffer);
 	}
@@ -202,5 +202,5 @@
 // @see Module.h
 string Node::getName() const {
-
+	return name.toString();
 }
 
Index: /source/ariba/communication/BaseCommunication.cpp
===================================================================
--- /source/ariba/communication/BaseCommunication.cpp	(revision 6916)
+++ /source/ariba/communication/BaseCommunication.cpp	(revision 6919)
@@ -539,5 +539,5 @@
 /// query a descriptor by local link id
 BaseCommunication::LinkDescriptor& BaseCommunication::queryLocalLink( const LinkID& link ) const {
-	for (int i=0; i<linkSet.size();i++)
+	for (size_t i=0; i<linkSet.size();i++)
 		if (linkSet[i]->localLink == link) return (LinkDescriptor&)*linkSet[i];
 
@@ -547,5 +547,5 @@
 /// query a descriptor by remote link id
 BaseCommunication::LinkDescriptor& BaseCommunication::queryRemoteLink( const LinkID& link ) const {
-	for (int i=0; i<linkSet.size();i++)
+	for (size_t i=0; i<linkSet.size();i++)
 		if (linkSet[i]->remoteLink == link) return (LinkDescriptor&)*linkSet[i];
 
@@ -555,5 +555,5 @@
 LinkIDs BaseCommunication::getLocalLinks( const address_v* addr ) const {
 	LinkIDs ids;
-	for (int i=0; i<linkSet.size(); i++){
+	for (size_t i=0; i<linkSet.size(); i++){
 		if( addr == NULL ){
 			ids.push_back( linkSet[i]->localLink );
Index: /source/ariba/communication/BaseCommunication.h
===================================================================
--- /source/ariba/communication/BaseCommunication.h	(revision 6916)
+++ /source/ariba/communication/BaseCommunication.h	(revision 6919)
@@ -41,6 +41,6 @@
 
 // boost & std includes
-#include <ext/hash_map>
-#include <ext/hash_set>
+#include <boost/unordered_map.hpp>
+#include <boost/unordered_set.hpp>
 #include <map>
 #include <set>
@@ -239,8 +239,8 @@
 		/// link identifiers
 		LinkID localLink;
+		const address_v* localLocator;
+
+		/// used underlay addresses for the link
 		LinkID remoteLink;
-
-		/// used underlay addresses for the link
-		const address_v* localLocator;
 		const address_v* remoteLocator;
 
Index: /source/ariba/communication/EndpointDescriptor.h
===================================================================
--- /source/ariba/communication/EndpointDescriptor.h	(revision 6916)
+++ /source/ariba/communication/EndpointDescriptor.h	(revision 6919)
@@ -107,4 +107,5 @@
 	EndpointDescriptor& operator=( const EndpointDescriptor& rhs) {
 		endpoints = rhs.endpoints;
+		return *this;
 	}
 
Index: /source/ariba/communication/messages/AribaBaseMsg.cpp
===================================================================
--- /source/ariba/communication/messages/AribaBaseMsg.cpp	(revision 6916)
+++ /source/ariba/communication/messages/AribaBaseMsg.cpp	(revision 6919)
@@ -66,5 +66,5 @@
 			return "typeLinkUpdate";
 		default:
-			"unknown";
+			return "unknown";
 	}
 	return "unknown";
Index: /source/ariba/communication/networkinfo/AddressDiscovery.cpp
===================================================================
--- /source/ariba/communication/networkinfo/AddressDiscovery.cpp	(revision 6916)
+++ /source/ariba/communication/networkinfo/AddressDiscovery.cpp	(revision 6919)
@@ -95,5 +95,4 @@
 void AddressDiscovery::discover_ip_addresses( endpoint_set& endpoints ) {
 	struct ifaddrs* ifaceBuffer = NULL;
-	struct ifaddrs* tmpAddr     = NULL;
 	void*           tmpAddrPtr  = NULL;
 
Index: /source/ariba/communication/networkinfo/NetworkChangeDetection.cpp
===================================================================
--- /source/ariba/communication/networkinfo/NetworkChangeDetection.cpp	(revision 6916)
+++ /source/ariba/communication/networkinfo/NetworkChangeDetection.cpp	(revision 6919)
@@ -190,7 +190,7 @@
 
 		for( ; bytesRead > 0; header = NLMSG_NEXT(header, bytesRead)) {
-			if (	!NLMSG_OK(header, bytesRead) ||
+			if (!NLMSG_OK(header, (int)bytesRead) ||
 				(size_t) bytesRead < sizeof(struct nlmsghdr) ||
-				(size_t) bytesRead < header->nlmsg_len) {
+				(size_t) bytesRead < (size_t)header->nlmsg_len) {
 				continue;
 			}
Index: /source/ariba/communication/networkinfo/NetworkChangeDetection.h
===================================================================
--- /source/ariba/communication/networkinfo/NetworkChangeDetection.h	(revision 6916)
+++ /source/ariba/communication/networkinfo/NetworkChangeDetection.h	(revision 6919)
@@ -93,6 +93,6 @@
 	void stopMonitoring();
 
+	volatile bool running;
 	boost::thread* monitoringThread;
-	volatile bool running;
 	static void monitoringThreadFunc( NetworkChangeDetection* obj );
 
Index: /source/ariba/communication/networkinfo/NetworkInterface.cpp
===================================================================
--- /source/ariba/communication/networkinfo/NetworkInterface.cpp	(revision 6916)
+++ /source/ariba/communication/networkinfo/NetworkInterface.cpp	(revision 6919)
@@ -47,5 +47,5 @@
 	name( "" ), index( -1 ), isRunning( false ),
 	isUp( false ), isLoopback(false ), isBroadcast( false ),
-	mtu( -1 ), isMulticast( false ), txQueueLen( -1 )
+	isMulticast( false ), mtu( -1 ), txQueueLen( -1 )
 {
 }
Index: /source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- /source/ariba/overlay/BaseOverlay.cpp	(revision 6916)
+++ /source/ariba/overlay/BaseOverlay.cpp	(revision 6919)
@@ -148,5 +148,5 @@
 	static bool equals( const Data& lhs, const Data& rhs ) {
 		if (rhs.getLength()!=lhs.getLength()) return false;
-		for (int i=0; i<lhs.getLength()/8; i++)
+		for (size_t i=0; i<lhs.getLength()/8; i++)
 			if (lhs.getBuffer()[i] != rhs.getBuffer()[i]) return false;
 		return true;
@@ -604,5 +604,5 @@
 	message->setDestinationNode(remote);
 	message->setService(service);
-	send( message, remote );
+	return send( message, remote );
 }
 
@@ -747,7 +747,9 @@
 
 BaseOverlay::BaseOverlay() :
-			bc(NULL), overlayInterface(NULL), nodeId(NodeID::UNSPECIFIED),
-			spovnetId(SpoVNetID::UNSPECIFIED), state(BaseOverlayStateInvalid),
-			sideport(&SideportListener::DEFAULT), started(false), counter(0) {
+			started(false),state(BaseOverlayStateInvalid),
+			bc(NULL),
+			nodeId(NodeID::UNSPECIFIED), spovnetId(SpoVNetID::UNSPECIFIED),
+			sideport(&SideportListener::DEFAULT), overlayInterface(NULL),
+			counter(0) {
 	dht = new DHT();
 	localDHT = new DHT();
@@ -1158,8 +1160,10 @@
 	sideport = _sideport;
 	_sideport->configure( this );
+	return true;
 }
 
 bool BaseOverlay::unregisterSidePort(SideportListener* _sideport) {
 	sideport = &SideportListener::DEFAULT;
+	return true;
 }
 
@@ -1789,4 +1793,5 @@
 	// erase the original descriptor
 	eraseDescriptor(ld->overlayId);
+	return true;
 }
 
@@ -2182,8 +2187,6 @@
 void BaseOverlay::dhtPut( const Data& key, const Data& value, int ttl, bool replace, bool no_local_refresh ) {
 
-	logging_info("DHT: putting key=" <<  key
-			<< " value=" << value
-			<< " ttl=" << ttl
-			<< " replace=" << replace
+	logging_info("DHT: putting key=" << key << " value=" << value
+		<< " ttl=" << ttl << " replace=" << replace
 	);
 
Index: /source/ariba/overlay/OverlayBootstrap.h
===================================================================
--- /source/ariba/overlay/OverlayBootstrap.h	(revision 6916)
+++ /source/ariba/overlay/OverlayBootstrap.h	(revision 6919)
@@ -106,4 +106,5 @@
 			nodeid = rhs.nodeid;
 			endpoint = rhs.endpoint;
+			return *this;
 		}
 
Index: /source/ariba/overlay/messages/DHTMessage.cpp
===================================================================
--- /source/ariba/overlay/messages/DHTMessage.cpp	(revision 6916)
+++ /source/ariba/overlay/messages/DHTMessage.cpp	(revision 6919)
@@ -10,5 +10,5 @@
 DHTMessage::DHTMessage() {
 	this->key.setLength(0);
-	this->ttl =0 ;
+	this->ttl = 0;
 	this->replace = false;
 }
@@ -18,5 +18,5 @@
 	this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
 	this->key = key.clone();
-	this->ttl =0 ;
+	this->ttl = 0;
 	this->replace = false;
 }
@@ -26,13 +26,15 @@
 	this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
 	this->key = key.clone();
-	this->values.push_back(  value.clone() );
-	this->ttl =0 ;
+	this->values.push_back( value.clone() );
+	this->ttl = 0;
 	this->replace = false;
 }
 
 DHTMessage::DHTMessage( const Data& key, const vector<Data>& values ) {
+	this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
 	this->key = key.clone();
 	BOOST_FOREACH(const Data value, values )
-			this->values.push_back( value.clone() );
+		this->values.push_back( value.clone() );
+	this->ttl = 0;
 	this->replace = false;
 }
Index: /source/ariba/overlay/messages/DHTMessage.h
===================================================================
--- /source/ariba/overlay/messages/DHTMessage.h	(revision 6916)
+++ /source/ariba/overlay/messages/DHTMessage.h	(revision 6919)
@@ -33,5 +33,5 @@
 
 	bool hasValues() const {
-		values.size() != 0;
+		return values.size() != 0;
 	}
 
Index: /source/ariba/overlay/messages/OverlayMsg.h
===================================================================
--- /source/ariba/overlay/messages/OverlayMsg.h	(revision 6916)
+++ /source/ariba/overlay/messages/OverlayMsg.h	(revision 6919)
@@ -213,4 +213,5 @@
 	uint8_t increaseNumHops() {
 		hops++;
+		return hops;
 	}
 
Index: /source/ariba/overlay/modules/OverlayInterface.h
===================================================================
--- /source/ariba/overlay/modules/OverlayInterface.h	(revision 6916)
+++ /source/ariba/overlay/modules/OverlayInterface.h	(revision 6919)
@@ -179,7 +179,4 @@
 	BaseOverlay& baseoverlay;
 
-	/// The parameters of the overlay structure
-	OverlayParameterSet parameters;
-
 	/// The node identifier to use with this overlay
 	const NodeID& nodeid;
@@ -187,4 +184,7 @@
 	/// The listener used to inform about overlay structure changes
 	OverlayStructureEvents* eventsReceiver;
+
+	/// The parameters of the overlay structure
+	OverlayParameterSet parameters;
 
 	/// The service identifer of this overlay
Index: /source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- /source/ariba/overlay/modules/chord/Chord.cpp	(revision 6916)
+++ /source/ariba/overlay/modules/chord/Chord.cpp	(revision 6919)
@@ -79,5 +79,5 @@
 
 	// check if we already have a connection
-	for (int i=0; i<table->size(); i++)
+	for (size_t i=0; i<table->size(); i++)
 		if ((*table)[i]->ref_count > 0 && (*table)[i]->id == remote && !((*table)[i]->info.isUnspecified()))
 			return LinkID::UNSPECIFIED;
@@ -291,5 +291,5 @@
 
 	// handle messages
-	switch (m->getType()) {
+	switch ((signalMessageTypes)m->getType()) {
 
 	// discovery request
@@ -317,5 +317,5 @@
 			setup( dmsg->getEndpoint(), m->getSourceNode() );
 
-		// delegate discovery message
+		// process discovery message -------------------------- switch start --
 		switch (dmsg->getType()) {
 
@@ -388,5 +388,13 @@
 			baseoverlay.send(&omsg, omsg.getDestinationNode());
 			break;
-		}}
+		}
+		case Discovery::invalid:
+			break;
+
+		default:
+			break;
+		}
+		// process discovery message ---------------------------- switch end --
+
 		delete dmsg;
 		break;
@@ -426,5 +434,5 @@
 		// updating neighbors
 		logging_debug("Discover new ring neighbors");
-		for (int i=0; i<table->size(); i++) {
+		for (size_t i=0; i<table->size(); i++) {
 			LinkID id = (*table)[i]->info;
 			if (!id.isUnspecified()) discover_neighbors(id);
Index: /source/ariba/overlay/modules/chord/detail/chord_routing_table.hpp
===================================================================
--- /source/ariba/overlay/modules/chord/detail/chord_routing_table.hpp	(revision 6916)
+++ /source/ariba/overlay/modules/chord/detail/chord_routing_table.hpp	(revision 6919)
@@ -92,5 +92,5 @@
 private:
 	// maximum number of fingers
-	static const int max_fingers = 32;
+	static const size_t max_fingers = 32;
 
 	// the own node id
Index: /source/ariba/overlay/modules/onehop/OneHop.cpp
===================================================================
--- /source/ariba/overlay/modules/onehop/OneHop.cpp	(revision 6916)
+++ /source/ariba/overlay/modules/onehop/OneHop.cpp	(revision 6919)
@@ -241,5 +241,5 @@
 	if( onemsg->isType( OneHopMessage::OneHopMessageTypeListingRequest ) ){
 
-		NodeListingRequest* request = onemsg->decapsulate<NodeListingRequest>();
+		//NodeListingRequest* request = onemsg->decapsulate<NodeListingRequest>();
 
 		logging_info( "onehop received node listing request from node " << remote.toString() );
Index: /source/ariba/utility/addressing/endpoint_set.hpp
===================================================================
--- /source/ariba/utility/addressing/endpoint_set.hpp	(revision 6916)
+++ /source/ariba/utility/addressing/endpoint_set.hpp	(revision 6919)
@@ -399,4 +399,5 @@
 		this->rfcomm = rhs.rfcomm;
 		this->tcp = rhs.tcp;
+		return *this;
 	}
 
Index: /source/ariba/utility/addressing/ip_address.hpp
===================================================================
--- /source/ariba/utility/addressing/ip_address.hpp	(revision 6916)
+++ /source/ariba/utility/addressing/ip_address.hpp	(revision 6919)
@@ -166,5 +166,4 @@
 	}
 
-
 	bool is_multicast_site_local() const {
 		if (addr.is_v4()) return false;
Index: /source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
===================================================================
--- /source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 6916)
+++ /source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 6919)
@@ -64,4 +64,7 @@
 namespace utility {
 
+static bdaddr_t bd_addr_any = {{0, 0, 0, 0, 0, 0}};
+static bdaddr_t bd_addr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
+
 use_logging_cpp(BluetoothSdp);
 OverlayBootstrap* BluetoothSdp::CONNECTION_CHECKER = NULL;
@@ -216,5 +219,5 @@
 	// connect to the local SDP server, register the service record
 	if( sdp_session_ == NULL ){
-		sdp_session_ = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY);
+		sdp_session_ = sdp_connect(&bd_addr_any, &bd_addr_local, SDP_RETRY_IF_BUSY);
 	}
 
@@ -275,5 +278,5 @@
 
 		bdaddr_t address;
-		uint8_t channel;
+//		uint8_t channel;
 
 		dev_id = hci_get_route(NULL);
@@ -339,5 +342,5 @@
 	char name[256], info1[256], info2[256], info3[256];
 
-	session = sdp_connect(BDADDR_ANY, &target, SDP_RETRY_IF_BUSY);
+	session = sdp_connect(&bd_addr_any, &target, SDP_RETRY_IF_BUSY);
 
 	if (session == NULL) {
@@ -401,5 +404,4 @@
 	 * Returns a string holding the bt adress in human readable form.
 	 */
-	char addr[32] = { 0 };
 	char str[32] = { 0 };
 	ba2str(ba, str);
Index: /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h
===================================================================
--- /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h	(revision 6916)
+++ /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h	(revision 6919)
@@ -197,6 +197,6 @@
 	public:
 		udp_server(boost::asio::io_service& io_service, ServiceList* _services, boost::mutex* _servicesmutex)
-			: services(_services), servicesmutex(_servicesmutex),
-				socket_v4(io_service), socket_v6(io_service) {
+			: socket_v4(io_service), socket_v6(io_service),
+			  services(_services), servicesmutex(_servicesmutex) {
 
 			if( open4() ) start_receive_4();
@@ -350,5 +350,5 @@
 
 				{ // insert new found service
-					boost::mutex::scoped_lock( *servicesmutex );
+					boost::mutex::scoped_lock lock( *servicesmutex );
 
 					ServiceList::iterator it = services->find( msg.getName() );
Index: /source/ariba/utility/measurement/PathloadMeasurement.cpp
===================================================================
--- /source/ariba/utility/measurement/PathloadMeasurement.cpp	(revision 6916)
+++ /source/ariba/utility/measurement/PathloadMeasurement.cpp	(revision 6919)
@@ -45,6 +45,6 @@
 
 PathloadMeasurement::PathloadMeasurement(BaseOverlay* _overlay)
-	: running( false ), resultNode( NodeID::UNSPECIFIED ),
-	  listener( NULL), serverpid( -1 ) {
+	: running( false ), listener( NULL), resultNode( NodeID::UNSPECIFIED ),
+	   serverpid( -1 ) {
 
 	if( _overlay != NULL ) // this is important due to the singleton interface!
@@ -142,5 +142,5 @@
 	char buf[128];
 	string content = "";
-	bool failed = true;
+//	bool failed = true;
 
 	while( fgets(buf, 100, stream) != NULL ){
Index: /source/ariba/utility/messages/Message.h
===================================================================
--- /source/ariba/utility/messages/Message.h	(revision 6916)
+++ /source/ariba/utility/messages/Message.h	(revision 6919)
@@ -106,5 +106,5 @@
 	 */
 	explicit inline Message( const Data& data ) :
-		srcAddr(NULL),destAddr(NULL), releasePayload(true) {
+		releasePayload(true), srcAddr(NULL),destAddr(NULL) {
 		this->payload = data.clone();
 //		this->root = shared_array<uint8_t>((uint8_t*)data.getBuffer());
@@ -246,5 +246,5 @@
 			} else {
 				if (msg->payload.isUnspecified()) {
-					size_t l = ((len == ~0) ? X.getRemainingLength() : len);
+					size_t l = ((len == ~(size_t)0) ? X.getRemainingLength() : len);
 					msg->payload = X.getRemainingData(l);
 					msg->releasePayload = false;
Index: /source/ariba/utility/messages/MessageProvider.cpp
===================================================================
--- /source/ariba/utility/messages/MessageProvider.cpp	(revision 6916)
+++ /source/ariba/utility/messages/MessageProvider.cpp	(revision 6919)
@@ -49,5 +49,5 @@
 bool MessageProvider::sendMessageToReceivers( const Message* message ) {
 	bool sent =  false;
-	for (int i=0; i<receivers.size(); i++)
+	for (size_t i=0; i<receivers.size(); i++)
 		if (receivers[i]->receiveMessage(message, LinkID::UNSPECIFIED, NodeID::UNSPECIFIED)) sent = true;
 	return sent;
@@ -59,5 +59,5 @@
 
 void MessageProvider::removeMessageReceiver( MessageReceiver* receiver ) {
-	for (int i=0; i<receivers.size(); i++)
+	for (size_t i=0; i<receivers.size(); i++)
 		if (receivers[i]==receiver) {
 			receivers.erase( receivers.begin()+i );
Index: /source/ariba/utility/serialization/DataStream.hpp
===================================================================
--- /source/ariba/utility/serialization/DataStream.hpp	(revision 6916)
+++ /source/ariba/utility/serialization/DataStream.hpp	(revision 6919)
@@ -516,5 +516,5 @@
 
 	/* array and vector support */
-	template<typename T>
+	template<typename T, bool staticArray = false>
 	class ArrayTpl : public ExplicitSerializer {
 	private:
@@ -527,5 +527,5 @@
 
 		sznMethodBegin(X)
-		if (X.isDeserializer()) v = new T[l];
+		if (X.isDeserializer() && !staticArray) v = new T[l];
 		for (size_t i=0; i<l; i++) X && v[i];
 		sznMethodEnd()
@@ -556,4 +556,9 @@
 	finline ArrayTpl<T> A( T*& array, size_t length ) {
 		return ArrayTpl<T>(array,length);
+	}
+
+	template<typename T>
+	finline ArrayTpl<T,true> static_A( T*& array, size_t length ) {
+		return ArrayTpl<T, true>(array,length);
 	}
 
Index: /source/ariba/utility/system/SystemEvent.h
===================================================================
--- /source/ariba/utility/system/SystemEvent.h	(revision 6916)
+++ /source/ariba/utility/system/SystemEvent.h	(revision 6919)
@@ -59,5 +59,5 @@
 	const void* data; //< data attached to the event
 
-public: 
+public:
 	// TODO: these should be private, but the gcc 3.4 in scratchbox for cross-compiling
 	// for Maemo (Nokia N810) gets confused when the friend class SystemQueue has a 
@@ -66,31 +66,22 @@
 	uint32_t delayTime; //< time the event is scheduled at, or 0 if it is to be fired immediately
 	uint32_t remainingDelay; //< remaining delay time for sleeping
-	
+
 public:
-	inline SystemEvent(
-			SystemEventListener* mlistener,
-			SystemEventType mtype = SystemEventType::DEFAULT,
-			void* mdata = NULL)
-			:	scheduledTime(boost::posix_time::not_a_date_time),
-				delayTime(0),
-				remainingDelay(0),
-				listener(mlistener),
-				type(mtype),
-				data(mdata) {
+	inline SystemEvent(SystemEventListener* mlistener, SystemEventType mtype =
+			SystemEventType::DEFAULT, void* mdata = NULL) :
+		listener(mlistener), type(mtype), data(mdata), scheduledTime(
+				boost::posix_time::not_a_date_time), delayTime(0),
+				remainingDelay(0)
+
+	{
 	}
 
 	template<typename T>
-	inline SystemEvent( SystemEventListener* mlistener,
-			SystemEventType mtype = SystemEventType::DEFAULT,
-			T* mdata = NULL)
-				:	scheduledTime(boost::posix_time::not_a_date_time),
-					delayTime(0),
-					remainingDelay(0),
-					listener(mlistener),
-					type(mtype),
-					data((void*)mdata) {
+	inline SystemEvent(SystemEventListener* mlistener, SystemEventType mtype =
+			SystemEventType::DEFAULT, T* mdata = NULL) :
+		listener(mlistener), type(mtype), data((void*) mdata), scheduledTime(
+				boost::posix_time::not_a_date_time), delayTime(0),
+				remainingDelay(0) {
 	}
-
-
 
 	inline SystemEvent(const SystemEvent& copy) {
@@ -126,5 +117,5 @@
 	template<typename T>
 	inline T* getData() const {
-		return (T*)*this;
+		return (T*) *this;
 	}
 
@@ -147,5 +138,6 @@
 };
 
-}} // spovnet, common
+}
+} // spovnet, common
 
 #endif /* SYSTEMEVENT_H_ */
Index: /source/ariba/utility/system/SystemQueue.cpp
===================================================================
--- /source/ariba/utility/system/SystemQueue.cpp	(revision 6916)
+++ /source/ariba/utility/system/SystemQueue.cpp	(revision 6919)
@@ -125,5 +125,5 @@
 
 SystemQueue::QueueThread::QueueThread(QueueThread* _transferQueue)
-	: running( false ), transferQueue( _transferQueue ) {
+	: transferQueue( _transferQueue ), running( false ) {
 }
 
Index: /source/ariba/utility/system/SystemQueue.h
===================================================================
--- /source/ariba/utility/system/SystemQueue.h	(revision 6916)
+++ /source/ariba/utility/system/SystemQueue.h	(revision 6919)
@@ -234,4 +234,5 @@
 #ifdef UNDERLAY_OMNET
 
+#if 0
 	//
 	// the system queue must be a singleton in simulations, too.
@@ -243,10 +244,11 @@
 	// this is the macro definition from macros.h
 	//
-	// #define Define_Module(CLASSNAME) \
-	//   static cModule *CLASSNAME##__create() {return new CLASSNAME();} \
+	// #define Define_Module(CLASSNAME) /backslash
+	//   static cModule *CLASSNAME##__create() {return new CLASSNAME();} /backslash
 	//   EXECUTE_ON_STARTUP(CLASSNAME##__mod, modtypes.instance()->add(new cModuleType(#CLASSNAME,#CLASSNAME,(ModuleCreateFunc)CLASSNAME##__create));)
 	//
 	// and this is how we do it :)
 	//
+#endif
 
   	static cModule* SystemQueue__create() {
Index: /source/ariba/utility/transport/tcpip/protlib/address.h
===================================================================
--- /source/ariba/utility/transport/tcpip/protlib/address.h	(revision 6916)
+++ /source/ariba/utility/transport/tcpip/protlib/address.h	(revision 6919)
@@ -790,6 +790,6 @@
 
 	node *insert(netaddress &key, data_type &dat) {
-		node *a, *b, *c, *n, *m;
-		int cmp, pos = 0;
+		node *a, *b = NULL, *c, *n, *m;
+		int cmp = 0, pos = 0;
 
 		c = a = key.is_ipv4() ? v4head : v6head;
Index: /source/ariba/utility/transport/tcpip/tcpip.cpp
===================================================================
--- /source/ariba/utility/transport/tcpip/tcpip.cpp	(revision 6916)
+++ /source/ariba/utility/transport/tcpip/tcpip.cpp	(revision 6919)
@@ -183,5 +183,5 @@
 		datamsg->set_pos(0);
 		uint32_t message_size = datamsg->decode32(true)-2;
-		uint16_t remote_port = datamsg->decode16(true);
+		//uint16_t remote_port = datamsg->decode16(true);
 
 
Index: /source/ariba/utility/types/Identifier.cpp
===================================================================
--- /source/ariba/utility/types/Identifier.cpp	(revision 6916)
+++ /source/ariba/utility/types/Identifier.cpp	(revision 6919)
@@ -70,5 +70,5 @@
 
 void Identifier::clearAddress() {
-	for (int i = 0; i < array_size; i++)
+	for (size_t i = 0; i < array_size; i++)
 		key[i] = 0;
 	isUnspec = false;
@@ -77,5 +77,5 @@
 
 bool Identifier::setAddress(string address) {
-	// TODO
+	return false;
 }
 
@@ -204,5 +204,5 @@
 	if (isUnspec) return std::string("<unspec>");
 
-	char temp[80];
+	char temp[250];
 	if (base == 16) {
 		int k = 0;
@@ -238,4 +238,5 @@
 }
 #endif
+	return "<not supported>";
 }
 
Index: /source/ariba/utility/types/ServiceID.h
===================================================================
--- /source/ariba/utility/types/ServiceID.h	(revision 6916)
+++ /source/ariba/utility/types/ServiceID.h	(revision 6919)
@@ -75,5 +75,5 @@
 
 	inline bool isUnspecified() const {
-		return (id==~0);
+		return (id==~(uint32_t)0);
 	}
 
Index: /source/ariba/utility/visual/DddVis.cpp
===================================================================
--- /source/ariba/utility/visual/DddVis.cpp	(revision 6916)
+++ /source/ariba/utility/visual/DddVis.cpp	(revision 6919)
@@ -125,4 +125,6 @@
 				order = ORDER_RANDOMLY;
 				break;
+			default:
+				break;
 			}