--- xrl_pim_node.cc	2010-10-29 09:22:41.000000000 -0700
+++ xrl_pim_node_modified.cc	2010-10-28 13:28:32.000000000 -0700
@@ -4180,8 +4180,8 @@
 				     is_scope_zone,
 				     vif_name,
 				     IPvX(vif_addr),
-				     reinterpret_cast<const uint8_t&>(bsr_priority),
-				     reinterpret_cast<const uint8_t&>(hash_mask_len),
+				     static_cast<const uint8_t&>(bsr_priority),
+				     static_cast<const uint8_t&>(hash_mask_len),
 				     error_msg)
 	!= XORP_OK) {
 	return XrlCmdError::COMMAND_FAILED(error_msg);
@@ -4227,8 +4227,8 @@
 				     is_scope_zone,
 				     vif_name,
 				     IPvX(vif_addr),
-				     reinterpret_cast<const uint8_t&>(bsr_priority),
-				     reinterpret_cast<const uint8_t&>(hash_mask_len),
+				     static_cast<const uint8_t&>(bsr_priority),
+				     static_cast<const uint8_t&>(hash_mask_len),
 				     error_msg)
 	!= XORP_OK) {
 	return XrlCmdError::COMMAND_FAILED(error_msg);
@@ -4326,8 +4326,8 @@
 				    is_scope_zone,
 				    vif_name,
 				    vif_addr,
-				    reinterpret_cast<const uint8_t&>(rp_priority),
-				    reinterpret_cast<const uint16_t&>(rp_holdtime),
+				    static_cast<const uint8_t&>(rp_priority),
+				    static_cast<const uint16_t&>(rp_holdtime),
 				    error_msg)
 	!= XORP_OK) {
 	return XrlCmdError::COMMAND_FAILED(error_msg);
@@ -4373,8 +4373,8 @@
 				    is_scope_zone,
 				    vif_name,
 				    vif_addr,
-				    reinterpret_cast<const uint8_t&>(rp_priority),
-				    reinterpret_cast<const uint16_t&>(rp_holdtime),
+				    static_cast<const uint8_t&>(rp_priority),
+				    static_cast<const uint16_t&>(rp_holdtime),
 				    error_msg)
 	!= XORP_OK) {
 	return XrlCmdError::COMMAND_FAILED(error_msg);
@@ -4478,8 +4478,8 @@
     
     if (PimNode::add_config_static_rp(IPvXNet(group_prefix),
 				      IPvX(rp_addr),
-				      reinterpret_cast<const uint8_t&>(rp_priority),
-				      reinterpret_cast<const uint8_t&>(hash_mask_len),
+				      static_cast<const uint8_t&>(rp_priority),
+				      static_cast<const uint8_t&>(hash_mask_len),
 				      error_msg)
 	!= XORP_OK) {
 	return XrlCmdError::COMMAND_FAILED(error_msg);
@@ -4521,8 +4521,8 @@
     
     if (PimNode::add_config_static_rp(IPvXNet(group_prefix),
 				      IPvX(rp_addr),
-				      reinterpret_cast<const uint8_t&>(rp_priority),
-				      reinterpret_cast<const uint8_t&>(hash_mask_len),
+				      static_cast<const uint8_t&>(rp_priority),
+				      static_cast<const uint8_t&>(hash_mask_len),
 				      error_msg)
 	!= XORP_OK) {
 	return XrlCmdError::COMMAND_FAILED(error_msg);
@@ -5462,9 +5462,9 @@
     }
     
     if (PimNode::add_test_jp_entry(IPvX(source_addr), IPvX(group_addr),
-				   reinterpret_cast<const uint8_t&>(group_mask_len),
+				   static_cast<const uint8_t&>(group_mask_len),
 				   entry_type, action_type,
-				   reinterpret_cast<const uint16_t&>(holdtime),
+				   static_cast<const uint16_t&>(holdtime),
 				   is_new_group)
 	!= XORP_OK) {
 	error_msg = c_format("Failed to add Join/Prune test entry "
@@ -5558,9 +5558,9 @@
     }
     
     if (PimNode::add_test_jp_entry(IPvX(source_addr), IPvX(group_addr),
-				   reinterpret_cast<const uint8_t&>(group_mask_len),
+				   static_cast<const uint8_t&>(group_mask_len),
 				   entry_type, action_type,
-				   reinterpret_cast<const uint16_t&>(holdtime),
+				   static_cast<const uint16_t&>(holdtime),
 				   is_new_group)
 	!= XORP_OK) {
 	error_msg = c_format("Failed to add Join/Prune test entry "
@@ -5755,9 +5755,9 @@
     if (PimNode::add_test_bsr_zone(PimScopeZoneId(zone_id_scope_zone_prefix,
 						  zone_id_is_scope_zone),
 				   IPvX(bsr_addr),
-				   reinterpret_cast<const uint8_t&>(bsr_priority),
-				   reinterpret_cast<const uint8_t&>(hash_mask_len),
-				   reinterpret_cast<const uint16_t&>(fragment_tag))
+				   static_cast<const uint8_t&>(bsr_priority),
+				   static_cast<const uint8_t&>(hash_mask_len),
+				   static_cast<const uint16_t&>(fragment_tag))
 	!= XORP_OK) {
 	error_msg = c_format("Failed to add BSR test zone %s "
 			     "with BSR address %s",
@@ -5812,9 +5812,9 @@
     if (PimNode::add_test_bsr_zone(PimScopeZoneId(zone_id_scope_zone_prefix,
 						  zone_id_is_scope_zone),
 				   IPvX(bsr_addr),
-				   reinterpret_cast<const uint8_t&>(bsr_priority),
-				   reinterpret_cast<const uint8_t&>(hash_mask_len),
-				   reinterpret_cast<const uint16_t&>(fragment_tag))
+				   static_cast<const uint8_t&>(bsr_priority),
+				   static_cast<const uint8_t&>(hash_mask_len),
+				   static_cast<const uint16_t&>(fragment_tag))
 	!= XORP_OK) {
 	error_msg = c_format("Failed to add BSR test zone %s "
 			     "with BSR address %s",
@@ -5858,7 +5858,7 @@
 		       zone_id_is_scope_zone),
 	IPvXNet(group_prefix),
 	is_scope_zone,
-	reinterpret_cast<const uint8_t&>(expected_rp_count))
+	static_cast<const uint8_t&>(expected_rp_count))
 	!= XORP_OK) {
 	error_msg = c_format("Failed to add group prefix %s "
 			     "for BSR test zone %s",
@@ -5902,7 +5902,7 @@
 		       zone_id_is_scope_zone),
 	IPvXNet(group_prefix),
 	is_scope_zone,
-	reinterpret_cast<const uint8_t&>(expected_rp_count))
+	static_cast<const uint8_t&>(expected_rp_count))
 	!= XORP_OK) {
 	error_msg = c_format("Failed to add group prefix %s "
 			     "for BSR test zone %s",
@@ -5952,8 +5952,8 @@
 						zone_id_is_scope_zone),
 				 IPvXNet(group_prefix),
 				 IPvX(rp_addr),
-				 reinterpret_cast<const uint8_t&>(rp_priority),
-				 reinterpret_cast<const uint16_t&>(rp_holdtime))
+				 static_cast<const uint8_t&>(rp_priority),
+				 static_cast<const uint16_t&>(rp_holdtime))
 	!= XORP_OK) {
 	error_msg = c_format("Failed to add test Cand-RP %s "
 			     "for group prefix %s for BSR zone %s",
@@ -6004,8 +6004,8 @@
 						zone_id_is_scope_zone),
 				 IPvXNet(group_prefix),
 				 IPvX(rp_addr),
-				 reinterpret_cast<const uint8_t&>(rp_priority),
-				 reinterpret_cast<const uint16_t&>(rp_holdtime))
+				 static_cast<const uint8_t&>(rp_priority),
+				 static_cast<const uint16_t&>(rp_holdtime))
 	!= XORP_OK) {
 	error_msg = c_format("Failed to add test Cand-RP %s "
 			     "for group prefix %s for BSR zone %s",