--- a/eapol/eapol_framework/eapol_common/type/tls_peap/tls/src/tls_peap_tlv_header.cpp	Thu Aug 19 09:58:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/type/tls_peap/tls/src/tls_peap_tlv_header.cpp	Tue Aug 31 15:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 8 %
+* %version: %
 */
 
 // This is enumeration of EAPOL source code.
@@ -239,8 +239,9 @@
 	EAP_ASSERT(flag_tlv_type_data != 0);
 	
 	flag_tlv_type_data[0] = static_cast<u8_t>(
-		flag_tlv_type_data[0] & (m_flag_mask_mandatory_tlv|m_flag_mask_reserved)
-		| ((type & 0xff00) >> 8) & ~(m_flag_mask_mandatory_tlv|m_flag_mask_reserved));
+		(flag_tlv_type_data[0] & (m_flag_mask_mandatory_tlv|m_flag_mask_reserved))
+		| (((type & 0xff00) >> 8) & ~(m_flag_mask_mandatory_tlv|m_flag_mask_reserved)));
+
 	flag_tlv_type_data[1] = static_cast<u8_t>(type & 0x00ff);
 }
 
@@ -254,11 +255,11 @@
 	
 	if (reserved == true)
 	{
-		flag_tlv_type_data[0] |= m_flag_mask_reserved;
+		flag_tlv_type_data[0] = static_cast<u8_t>(flag_tlv_type_data[0] | m_flag_mask_reserved);
 	}
 	else
 	{
-		flag_tlv_type_data[0] &= ~m_flag_mask_reserved;
+		flag_tlv_type_data[0] = static_cast<u8_t>(flag_tlv_type_data[0] & ~m_flag_mask_reserved);
 	}
 }
 
@@ -272,11 +273,11 @@
 	
 	if (mandatory_when_true == true)
 	{
-		flag_tlv_type_data[0] |= m_flag_mask_mandatory_tlv;
+		flag_tlv_type_data[0] = static_cast<u8_t>(flag_tlv_type_data[0] | m_flag_mask_mandatory_tlv);
 	}
 	else
 	{
-		flag_tlv_type_data[0] &= ~m_flag_mask_mandatory_tlv;
+		flag_tlv_type_data[0] = static_cast<u8_t>(flag_tlv_type_data[0] & ~m_flag_mask_mandatory_tlv);
 	}
 }