Index: source/ariba/communication/networkinfo/AddressDiscovery.cpp
===================================================================
--- source/ariba/communication/networkinfo/AddressDiscovery.cpp	(revision 5860)
+++ 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 5860)
+++ 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 5860)
+++ 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 5860)
+++ 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 )
 {
 }