clang: fix rest of xorp to compile with clang.

Signed-off-by: Ben Greear <greearb@candelatech.com>
greearb · Jun 11, 2010 · 6fe391d · 6fe391d
1 parent a9d5114
commit 6fe391d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 14 deletions.
diff --git a/xorp/RELEASE_NOTES b/xorp/RELEASE_NOTES
@@ -3,7 +3,20 @@
 
 This file contains XORP release notes (most recent releases first).
 
-Relase 1.8-CT  June, 2010
+Release 1.9-CT  (Work in Progress)
+
+   *  Add more options for disabling compile of certain modules.
+      See:  scons --help
+
+   *  Add support for IPv6 multicast with virtual routing tables.
+      Requires patched linux kernel or 2.6.35 when it comes out.
+
+   *  Support compiling with clang + llvm compiler:
+      Install latest clang and llvm from their SVN repositories and:
+      scons CC=clang CXX=clang++
+
+
+Release 1.8-CT  June, 2010
 
 Overview:
 

diff --git a/xorp/bgp/harness/peer.cc b/xorp/bgp/harness/peer.cc
@@ -91,7 +91,7 @@ Peer::Peer(const Peer& rhs)
     copy(rhs);
 }
 
-Peer::Peer&
+Peer&
 Peer::operator=(const Peer& rhs)
 {
     debug_msg("= operator\n");

diff --git a/xorp/bgp/route_table_policy_im.cc b/xorp/bgp/route_table_policy_im.cc
@@ -122,8 +122,8 @@ PolicyTableImport<A>::route_dump(InternalMessage<A>& rtmsg,
     // we want current filter
     rtmsg.route()->set_policyfilter(0, RefPf());
 
-    bool old_accepted = do_filtering(*old_rtmsg, false);
-    bool new_accepted = do_filtering(rtmsg, false);
+    bool old_accepted = this->do_filtering(*old_rtmsg, false);
+    bool new_accepted = this->do_filtering(rtmsg, false);
 
     InternalMessage<A> *new_rtmsg = 0;
     SubnetRoute<A>* copy_new_route = 0;

diff --git a/xorp/fea/data_plane/ifconfig/ifconfig_parse_netlink_socket.cc b/xorp/fea/data_plane/ifconfig/ifconfig_parse_netlink_socket.cc
@@ -105,7 +105,7 @@ IfConfigGetNetlinkSocket::parse_buffer_netlink_socket(IfConfig& ifconfig,
 	    }
 	    errno = -err->error;
 	    nl_errno = -err->error;
-	    XLOG_ERROR("AF_NETLINK NLMSG_ERROR: %s  msg->len: %hu msg->type: %hu(%s) "
+	    XLOG_ERROR("AF_NETLINK NLMSG_ERROR: %s  msg->len: %u msg->type: %hu(%s) "
 		       " msg->flags: %hu msg->seq: %u  msg->pid: %u",
 		       strerror(errno), err->msg.nlmsg_len, err->msg.nlmsg_type,
 		       NlmUtils::nlm_msg_type(err->msg.nlmsg_type).c_str(),

diff --git a/xorp/ospf/peer.cc b/xorp/ospf/peer.cc
@@ -302,19 +302,17 @@ PeerOut<A>::peer_change()
 {
     XLOG_WARNING("PeerOut, peer_change on interface: %s  running: %i  status: %i  link-status: %i",
 		 get_if_name().c_str(), (int)(_running), (int)(_status), (int)(_link_status));
-    switch (_running) {
-    case true:
+    if (_running) {
 	if (false == _status || false == _link_status) {
 	    take_down_peering();
 	    _running = false;
 	}
-	break;
-    case false:
+    }
+    else {
 	if (true == _status && true == _link_status) {
 	    _running = true;
 	    _running = bring_up_peering();
 	}
-	break;
     }
 }
 

diff --git a/xorp/pim/xrl_pim_node.cc b/xorp/pim/xrl_pim_node.cc
@@ -4435,8 +4435,8 @@ XrlPimNode::pim_0_1_add_config_cand_rp6(
 				    is_scope_zone,
 				    vif_name,
 				    vif_addr,
-				    reinterpret_cast<const uint8_t&>(rp_priority),
-				    reinterpret_cast<const uint16_t&>(rp_holdtime),
+				    (uint8_t)(rp_priority),
+				    (uint16_t)(rp_holdtime),
 				    error_msg)
 	!= XORP_OK) {
 	return XrlCmdError::COMMAND_FAILED(error_msg);

diff --git a/xorp/rip/output_table.cc b/xorp/rip/output_table.cc
@@ -68,7 +68,7 @@ OutputTable<A>::output_packet()
 					        origin, r->tag(),
 						r->policytags());
 
-	bool accepted = do_filtering(copy);
+	bool accepted = this->do_filtering(copy);
 	if (!accepted) {
 	    delete copy;
 	    continue;

diff --git a/xorp/rip/output_updates.cc b/xorp/rip/output_updates.cc
@@ -78,7 +78,7 @@ OutputUpdates<A>::output_packet()
 						origin, r->tag(),
 						r->policytags());
 
-	bool accepted = do_filtering(copy);
+	bool accepted = this->do_filtering(copy);
 	if (!accepted) {
 	    delete copy;
 	    continue;