Fixed problems with try/catch, hopefully. Thanks Axel for pointing them
out. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21486 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -610,11 +610,11 @@ BWindowScreen::_InitData(uint32 space, uint32 attributes)
|
|||||||
|
|
||||||
fActivateSem = create_sem(0, "WindowScreen start lock");
|
fActivateSem = create_sem(0, "WindowScreen start lock");
|
||||||
if (fActivateSem < B_OK)
|
if (fActivateSem < B_OK)
|
||||||
throw fActivateSem;
|
throw (status_t)fActivateSem;
|
||||||
|
|
||||||
fDebugSem = create_sem(1, "WindowScreen debug sem");
|
fDebugSem = create_sem(1, "WindowScreen debug sem");
|
||||||
if (fDebugSem < B_OK)
|
if (fDebugSem < B_OK)
|
||||||
throw fDebugSem;
|
throw (status_t)fDebugSem;
|
||||||
|
|
||||||
memcpy(fPalette, screen.ColorMap()->color_list, sizeof(fPalette));
|
memcpy(fPalette, screen.ColorMap()->color_list, sizeof(fPalette));
|
||||||
fActivateState = 0;
|
fActivateState = 0;
|
||||||
@@ -624,7 +624,7 @@ BWindowScreen::_InitData(uint32 space, uint32 attributes)
|
|||||||
|
|
||||||
} catch (std::bad_alloc) {
|
} catch (std::bad_alloc) {
|
||||||
status = B_NO_MEMORY;
|
status = B_NO_MEMORY;
|
||||||
} catch (int error) {
|
} catch (status_t error) {
|
||||||
status = error;
|
status = error;
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
status = B_ERROR;
|
status = B_ERROR;
|
||||||
|
|||||||
Reference in New Issue
Block a user