Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert r42251. Cast the enum to uint32 before use in switchs to please GCC 4.5.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42266 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2011-06-20 21:12:10 +00:00
parent b2a55ebf98
commit aa56e459e0
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
headers/os/storage/FindDirectory.h
View File

@ -69,20 +69,11 @@ typedef enum {
B_USER_SOUNDS_DIRECTORY,
B_USER_DATA_DIRECTORY,
B_USER_CACHE_DIRECTORY,
B_USER_MAIL_DIRECTORY,
B_USER_QUERIES_DIRECTORY,
B_USER_PEOPLE_DIRECTORY,
B_USER_DOWNLOADS_DIRECTORY,
B_USER_DESKBAR_APPS_DIRECTORY,
B_USER_DESKBAR_PREFERENCES_DIRECTORY,
B_USER_DESKBAR_DEVELOP_DIRECTORY,
/* Global directories. */
B_APPS_DIRECTORY = 4000,
B_PREFERENCES_DIRECTORY,
B_UTILITIES_DIRECTORY,
B_BOOT_DISK,
/* Obsolete: Legacy BeOS definition to be phased out */
B_BEOS_DIRECTORY = 1000,

12
src/kits/tracker/FSUtils.h
View File

@ -260,6 +260,18 @@ _IMPEXP_TRACKER void FSOpenWithDocuments(const entry_ref *executableToLaunch,
_IMPEXP_TRACKER status_t FSLaunchUsing(const entry_ref *ref, BMessage *listOfRefs);
// some extra directory_which values
// move these to FindDirectory.h
const uint32 B_USER_MAIL_DIRECTORY = 3500;
const uint32 B_USER_QUERIES_DIRECTORY = 3501;
const uint32 B_USER_PEOPLE_DIRECTORY = 3502;
const uint32 B_USER_DOWNLOADS_DIRECTORY = 3503;
const uint32 B_USER_DESKBAR_APPS_DIRECTORY = 3504;
const uint32 B_USER_DESKBAR_PREFERENCES_DIRECTORY = 3505;
const uint32 B_USER_DESKBAR_DEVELOP_DIRECTORY = 3506;
const uint32 B_BOOT_DISK = 3507;
// map /boot into the directory_which enum for convenience
class WellKnowEntryList {
// matches up names, id's and node_refs of well known entries in the
// system hierarchy

2
src/kits/tracker/IconCache.cpp
View File

@ -647,7 +647,7 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache> *,
// match up well known entries in the file system with specialized
// icons stored in Tracker's resources
int32 resid = -1;
switch (wellKnownEntry->which) {
switch ((uint32)wellKnownEntry->which) {
case B_BOOT_DISK:
resid = R_BootVolumeIcon;
break;