Changeset 62436 in vbox for trunk/src

Timestamp:

Jul 22, 2016 12:46:53 PM (8 years ago)

Author:

vboxsync

Message:

IPRT/R0/RC: MSC level 4 warnings

Location:

trunk/src/VBox/Runtime

Files:

trunk/src/VBox/Runtime/common/log/log.cpp

-              r60883
+              r62436
             uint16_t const iGroup = RT_HI_U16(fFlagsAndGroup);
             if (   iGroup != UINT16_MAX
                  && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
                      != (fFlags | RTLOGGRPFLAGS_ENABLED)))
+                 && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | (uint32_t)RTLOGGRPFLAGS_ENABLED))
+                     != (fFlags | (uint32_t)RTLOGGRPFLAGS_ENABLED)))
             pLogger = NULL;
+        }

-              r57358
+              r62436
             uint16_t const iGroup = RT_HI_U16(fFlagsAndGroup);
             if (   iGroup != UINT16_MAX
                  && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | RTLOGGRPFLAGS_ENABLED))
                      != (fFlags | RTLOGGRPFLAGS_ENABLED)))
+                 && (   (pLogger->afGroups[iGroup < pLogger->cGroups ? iGroup : 0] & (fFlags | (uint32_t)RTLOGGRPFLAGS_ENABLED))
+                     != (fFlags | (uint32_t)RTLOGGRPFLAGS_ENABLED)))
             pLogger = NULL;
+        }

-              r54940
+              r62436
                  * No joy must try again.
                  */
+#ifdef _MSC_VER
+# pragma warning(disable: 4702)
+#endif
 #ifndef IN_RING3
                 ASMSetFlags(uFlags);

r59039	r62436
298	298	*/
299	299	IPRT_CRITSECT_WAITING(pCritSect, NULL, cLockers, (void *)pCritSect->NativeThreadOwner);
300		#if~~ndef RTCRITSECT_STRICT~~
	300	#if !defined(RTCRITSECT_STRICT) && defined(IN_RING3)
301	301	RTTHREAD hThreadSelf = RTThreadSelf();
302	302	#endif

Note: See TracChangeset for help on using the changeset viewer.