Build fix for input_server filters
Apparently not linking to libstdc++ correctly is causing an error. Also, use new(std::nothrow) when creating the input server filter to avoid an exception from being thrown by the constructor in the case of low memory.
This commit is contained in:
@@ -6,5 +6,5 @@ UsePrivateHeaders interface tracker ;
|
||||
|
||||
Addon minimize_all
|
||||
: MinimizeAllInputFilter.cpp
|
||||
: be input_server $(TARGET_LIBSUPC++)
|
||||
: be input_server [ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2014 Haiku, Inc. All rights reserved
|
||||
* Copyright 2015 Haiku, Inc. All rights reserved
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Authors:
|
||||
@@ -11,6 +11,8 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <new>
|
||||
|
||||
#include <InterfaceDefs.h>
|
||||
#include <Message.h>
|
||||
#include <OS.h>
|
||||
@@ -24,7 +26,7 @@
|
||||
|
||||
|
||||
extern "C" BInputServerFilter* instantiate_input_filter() {
|
||||
return new MinimizeAllInputFilter();
|
||||
return new(std::nothrow) MinimizeAllInputFilter();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -6,5 +6,5 @@ UsePrivateHeaders app ;
|
||||
|
||||
Addon switch_workspace
|
||||
: SwitchWorkspaceInputFilter.cpp
|
||||
: be input_server $(TARGET_LIBSUPC++)
|
||||
: be input_server [ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2009-2014 Haiku, Inc. All rights reserved
|
||||
* Copyright 2009-2015 Haiku, Inc. All rights reserved
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Authors:
|
||||
@@ -12,6 +12,8 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <new>
|
||||
|
||||
#include <AppServerLink.h>
|
||||
#include <InterfaceDefs.h>
|
||||
#include <Message.h>
|
||||
@@ -22,7 +24,7 @@
|
||||
|
||||
|
||||
extern "C" BInputServerFilter* instantiate_input_filter() {
|
||||
return new SwitchWorkspaceInputFilter();
|
||||
return new(std::nothrow) SwitchWorkspaceInputFilter();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user