Merge branch 'master' of newton:/data1/x0-0-0/pwr

src/exe/co_convert/src/cnv_xtthelptoxml.cpp

@@ -217,7 +217,7 @@ void *CnvXtthelpToXml::insert( navh_eItemType item_type, const char *t1,
 
   if ( (t2 && strcmp(text2, "") != 0) || 
        (t3 && strcmp(text3, "") != 0) ) {
-    if ( !status & xml_mStatus_table) {
+    if ( !(status & xml_mStatus_table)) {
       fp << 
 tags[xml_eTag_table].start << endl;
       status |= xml_mStatus_table;

src/exe/rt_post/src/rt_post.cpp

@@ -215,8 +215,8 @@ pwr_tStatus rt_post::mh_alarm_bc( mh_sMessage *MsgP)
   if ( !post || post->conf->Disable)
     return 1;
 
-  if ( !event->Info.EventFlags & pwr_mEventFlagsMask_Email ||
-       !event->Info.EventFlags & pwr_mEventFlagsMask_SMS)
+  if ( !(event->Info.EventFlags & pwr_mEventFlagsMask_Email) ||
+       !(event->Info.EventFlags & pwr_mEventFlagsMask_SMS))
     return 1;
 
   // Skip events older than 10 minutes

src/lib/rt/src/rt_pvd_file.cpp

@@ -89,7 +89,7 @@ void rt_pvd_file::objectName( co_procom *pcom, char *name, pwr_tOix poix)
 {
 
   for ( int i = 0; i < (int) m_list.size(); i++) {
-    if  ( !m_list[i].flags & procom_obj_mFlags_Deleted) {
+    if  ( !(m_list[i].flags & procom_obj_mFlags_Deleted)) {
       if ( cdh_NoCaseStrcmp( name, longname(m_list[i].oix)) == 0) {
 	objectOid( pcom, i);
 	return;
@@ -526,7 +526,7 @@ bool rt_pvd_file::find( pwr_tOix fthoix, const char *name, pwr_tOix *oix)
 {
 
   for ( int i = 0; i < (int) m_list.size(); i++) {
-    if  ( !m_list[i].flags & procom_obj_mFlags_Deleted) {
+    if  ( !(m_list[i].flags & procom_obj_mFlags_Deleted)) {
       if ( m_list[i].fthoix == fthoix && 
 	   cdh_NoCaseStrcmp( name, m_list[i].name) == 0) {
 	*oix = m_list[i].oix;

wb/lib/wb/src/wb_merep.cpp

@@ -607,7 +607,7 @@ void wb_merep::insertCattObject( pwr_tStatus *sts, pwr_tCid cid,
     key.idx++;
     item = (merep_sClassAttr *) tree_Find( sts, m_catt_tt, &key);
   }
-  if ( !adp->flags() & PWR_MASK_ARRAY) {
+  if ( !(adp->flags() & PWR_MASK_ARRAY)) {
     if ( ODD(*sts)) {
       // Insert in found item
       item->offset[item->numOffset] = offset + adp->offset();

wb/lib/wb/src/wb_tra.cpp

@@ -557,7 +557,7 @@ static pwr_tStatus trace_get_attr_m5( 	WGre		*gre,
 	&objar, &info);
   if( EVEN(sts)) return sts;
 
-  if ( !info.flags & PWR_MASK_DISABLEATTR)
+  if ( !(info.flags & PWR_MASK_DISABLEATTR))
     return TRA__NOPAR;
 
   disar = cdh_ArefToDisableAref( &objar);

xtt/lib/xtt/src/xtt_c_plcpgm.cpp

@@ -134,7 +134,7 @@ static pwr_tStatus SetScanFilter( xmenu_sMenuCall *ip)
   pwr_tClassId classid;
   int enable;
 
-  if ( !ip->Priv & pwr_mPrv_System)
+  if ( !(ip->Priv & pwr_mPrv_System))
     return XNAV__INSENSITIVE;
 
   if ( strcmp( "Enable", ip->ItemList[ip->ChosenItem].FilterArguments[0]) == 0)

xtt/lib/xtt/src/xtt_xnav_command.cpp

@@ -9545,7 +9545,7 @@ int	XNav::show_par_hier_class_name(
   }
 
 
-  if ( !add == XNAV_MENU_ADD) 
+  if ( !(add == XNAV_MENU_ADD)) 
     brow_pop();
 
   try {