|
From: <sv...@va...> - 2014-10-17 15:05:08
|
Author: sewardj
Date: Fri Oct 17 16:05:01 2014
New Revision: 14634
Log:
-Wmissing-enum seems to have arrived at the MacOS builds for some
reason, and complains about missing cases in sr_isError, sr_Res,
sr_ResHI, sr_Err. Add cases to keep it happy.
Modified:
trunk/include/pub_tool_basics.h
Modified: trunk/include/pub_tool_basics.h
==============================================================================
--- trunk/include/pub_tool_basics.h (original)
+++ trunk/include/pub_tool_basics.h Fri Oct 17 16:05:01 2014
@@ -217,9 +217,14 @@
static inline Bool sr_isError ( SysRes sr ) {
switch (sr._mode) {
- case SysRes_UNIX_ERR: return True;
- default: return False;
+ case SysRes_UNIX_ERR:
+ return True;
/* should check tags properly and assert here, but we can't here */
+ case SysRes_MACH:
+ case SysRes_MDEP:
+ case SysRes_UNIX_OK:
+ default:
+ return False;
}
}
@@ -227,22 +232,38 @@
switch (sr._mode) {
case SysRes_MACH:
case SysRes_MDEP:
- case SysRes_UNIX_OK: return sr._wLO;
- default: return 0; /* should assert, but we can't here */
+ case SysRes_UNIX_OK:
+ return sr._wLO;
+ /* should assert, but we can't here */
+ case SysRes_UNIX_ERR:
+ default:
+ return 0;
}
}
static inline UWord sr_ResHI ( SysRes sr ) {
switch (sr._mode) {
- case SysRes_UNIX_OK: return sr._wHI;
- default: return 0; /* should assert, but we can't here */
+ case SysRes_UNIX_OK:
+ return sr._wHI;
+ /* should assert, but we can't here */
+ case SysRes_MACH:
+ case SysRes_MDEP:
+ case SysRes_UNIX_ERR:
+ default:
+ return 0;
}
}
static inline UWord sr_Err ( SysRes sr ) {
switch (sr._mode) {
- case SysRes_UNIX_ERR: return sr._wLO;
- default: return 0; /* should assert, but we can't here */
+ case SysRes_UNIX_ERR:
+ return sr._wLO;
+ /* should assert, but we can't here */
+ case SysRes_MACH:
+ case SysRes_MDEP:
+ case SysRes_UNIX_OK:
+ default:
+ return 0;
}
}
|