From bef21ed9aa0b0ad939eb98f01da905eee3c5ab9e Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Fri, 22 Feb 2019 08:16:37 +0100 Subject: nodejs: fix additional compatibility with older gcc - replace all occurrences of std::make_unique with wrapper - sync indent level Signed-off-by: Andrej Valek Signed-off-by: Khem Raj --- .../0004-Make-compatibility-with-gcc-4.8.patch | 36 +++++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch index 2b325b675f..cb38362e4f 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch @@ -5,22 +5,42 @@ method to be compatible with gcc < 4.9 . Signed-off-by: Andrej Valek diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc ---- node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:40:36.040538319 +0100 -+++ node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:39:57.883668702 +0100 +--- node-v10.15.1/src/cares_wrap.cc 2019-01-29 08:20:50.000000000 +0100 ++++ node-v10.15.1/src/cares_wrap.cc 2019-02-21 16:22:25.489131665 +0100 @@ -52,6 +52,16 @@ # define AI_V4MAPPED 0 #endif +#ifndef __cpp_lib_make_unique -+ namespace std { -+ /// make_unique implementation -+ template -+ std::unique_ptr make_unique(Args&&... args) { -+ return std::unique_ptr(new T(std::forward(args)...)); -+ } ++namespace std { ++ /// make_unique implementation ++ template ++ std::unique_ptr make_unique(Args&&... args) { ++ return std::unique_ptr(new T(std::forward(args)...)); + } ++} +#endif + namespace node { namespace cares_wrap { +diff -Naur node-v10.15.1/src/inspector_agent.cc node-v10.15.1/src/inspector_agent.cc +--- node-v10.15.1/src/inspector_agent.cc 2019-01-29 08:20:50.000000000 +0100 ++++ node-v10.15.1/src/inspector_agent.cc 2019-02-21 16:22:09.000185992 +0100 +@@ -24,6 +24,16 @@ + #include + #endif // __POSIX__ + ++#ifndef __cpp_lib_make_unique ++namespace std { ++ /// make_unique implementation ++ template ++ std::unique_ptr make_unique(Args&&... args) { ++ return std::unique_ptr(new T(std::forward(args)...)); ++ } ++} ++#endif ++ + namespace node { + namespace inspector { + namespace { -- cgit 1.2.3-korg