hrev48730 adds 1 changeset to branch 'master' old head: a0c83527188c9e107f0cf4f8d898ca34f79168e3 new head: 558a3eede11d288ab7b639908198dce2830f73bc overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=558a3eede11d+%5Ea0c83527188c ---------------------------------------------------------------------------- 558a3eede11d: 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. [ John Scipione <jscipione@xxxxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev48730 Commit: 558a3eede11d288ab7b639908198dce2830f73bc URL: http://cgit.haiku-os.org/haiku/commit/?id=558a3eede11d Author: John Scipione <jscipione@xxxxxxxxx> Date: Tue Jan 27 00:10:18 2015 UTC ---------------------------------------------------------------------------- 4 files changed, 10 insertions(+), 6 deletions(-) src/add-ons/input_server/filters/minimize_all/Jamfile | 2 +- .../filters/minimize_all/MinimizeAllInputFilter.cpp | 6 ++++-- src/add-ons/input_server/filters/switch_workspace/Jamfile | 2 +- .../filters/switch_workspace/SwitchWorkspaceInputFilter.cpp | 6 ++++-- ---------------------------------------------------------------------------- diff --git a/src/add-ons/input_server/filters/minimize_all/Jamfile b/src/add-ons/input_server/filters/minimize_all/Jamfile index 94b5039..2088c6e 100644 --- a/src/add-ons/input_server/filters/minimize_all/Jamfile +++ b/src/add-ons/input_server/filters/minimize_all/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders interface tracker ; Addon minimize_all : MinimizeAllInputFilter.cpp - : be input_server $(TARGET_LIBSUPC++) + : be input_server [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; diff --git a/src/add-ons/input_server/filters/minimize_all/MinimizeAllInputFilter.cpp b/src/add-ons/input_server/filters/minimize_all/MinimizeAllInputFilter.cpp index 73d9d52..fd71116 100644 --- a/src/add-ons/input_server/filters/minimize_all/MinimizeAllInputFilter.cpp +++ b/src/add-ons/input_server/filters/minimize_all/MinimizeAllInputFilter.cpp @@ -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(); } diff --git a/src/add-ons/input_server/filters/switch_workspace/Jamfile b/src/add-ons/input_server/filters/switch_workspace/Jamfile index 851ecd6..0244c21 100644 --- a/src/add-ons/input_server/filters/switch_workspace/Jamfile +++ b/src/add-ons/input_server/filters/switch_workspace/Jamfile @@ -6,5 +6,5 @@ UsePrivateHeaders app ; Addon switch_workspace : SwitchWorkspaceInputFilter.cpp - : be input_server $(TARGET_LIBSUPC++) + : be input_server [ TargetLibstdc++ ] [ TargetLibsupc++ ] ; diff --git a/src/add-ons/input_server/filters/switch_workspace/SwitchWorkspaceInputFilter.cpp b/src/add-ons/input_server/filters/switch_workspace/SwitchWorkspaceInputFilter.cpp index 2190920..8d751e5 100644 --- a/src/add-ons/input_server/filters/switch_workspace/SwitchWorkspaceInputFilter.cpp +++ b/src/add-ons/input_server/filters/switch_workspace/SwitchWorkspaceInputFilter.cpp @@ -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(); }