diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2019-02-22 08:16:37 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-02-22 18:14:52 -0800 |
commit | bef21ed9aa0b0ad939eb98f01da905eee3c5ab9e (patch) | |
tree | 2085b9c1b7c9cca4ecf041c3bd1ca8cc392d42e6 /meta-oe/recipes-devtools | |
parent | 1249297f32f050915cbcc3aecc8d45c700e6d3e8 (diff) | |
download | meta-openembedded-bef21ed9aa0b0ad939eb98f01da905eee3c5ab9e.tar.gz |
nodejs: fix additional compatibility with older gcc
- replace all occurrences of std::make_unique with wrapper
- sync indent level
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/nodejs/nodejs/0004-Make-compatibility-with-gcc-4.8.patch | 36 |
1 files 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 2b325b675..cb38362e4 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 . | |||
5 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | 5 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
6 | 6 | ||
7 | diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc | 7 | diff -Naur node-v10.15.1/src/cares_wrap.cc node-v10.15.1/src/cares_wrap.cc |
8 | --- node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:40:36.040538319 +0100 | 8 | --- node-v10.15.1/src/cares_wrap.cc 2019-01-29 08:20:50.000000000 +0100 |
9 | +++ node-v10.15.1/src/cares_wrap.cc 2019-02-17 09:39:57.883668702 +0100 | 9 | +++ node-v10.15.1/src/cares_wrap.cc 2019-02-21 16:22:25.489131665 +0100 |
10 | @@ -52,6 +52,16 @@ | 10 | @@ -52,6 +52,16 @@ |
11 | # define AI_V4MAPPED 0 | 11 | # define AI_V4MAPPED 0 |
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | +#ifndef __cpp_lib_make_unique | 14 | +#ifndef __cpp_lib_make_unique |
15 | + namespace std { | 15 | +namespace std { |
16 | + /// make_unique implementation | 16 | + /// make_unique implementation |
17 | + template<typename T, typename... Args> | 17 | + template<typename T, typename... Args> |
18 | + std::unique_ptr<T> make_unique(Args&&... args) { | 18 | + std::unique_ptr<T> make_unique(Args&&... args) { |
19 | + return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); | 19 | + return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); |
20 | + } | ||
21 | + } | 20 | + } |
21 | +} | ||
22 | +#endif | 22 | +#endif |
23 | + | 23 | + |
24 | namespace node { | 24 | namespace node { |
25 | namespace cares_wrap { | 25 | namespace cares_wrap { |
26 | 26 | ||
27 | diff -Naur node-v10.15.1/src/inspector_agent.cc node-v10.15.1/src/inspector_agent.cc | ||
28 | --- node-v10.15.1/src/inspector_agent.cc 2019-01-29 08:20:50.000000000 +0100 | ||
29 | +++ node-v10.15.1/src/inspector_agent.cc 2019-02-21 16:22:09.000185992 +0100 | ||
30 | @@ -24,6 +24,16 @@ | ||
31 | #include <pthread.h> | ||
32 | #endif // __POSIX__ | ||
33 | |||
34 | +#ifndef __cpp_lib_make_unique | ||
35 | +namespace std { | ||
36 | + /// make_unique implementation | ||
37 | + template<typename T, typename... Args> | ||
38 | + std::unique_ptr<T> make_unique(Args&&... args) { | ||
39 | + return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); | ||
40 | + } | ||
41 | +} | ||
42 | +#endif | ||
43 | + | ||
44 | namespace node { | ||
45 | namespace inspector { | ||
46 | namespace { | ||