[oe-commits] [meta-openembedded] 16/20: nodejs: fix additional compatibility with older gcc

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit bef21ed9aa0b0ad939eb98f01da905eee3c5ab9e
Author: Andrej Valek <andrej.valek at siemens.com>
AuthorDate: Fri Feb 22 08:16:37 2019 +0100

    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 at siemens.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../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 2b325b6..cb38362 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 <andrej.valek at siemens.com>
 
 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<typename T, typename... Args>
-+    std::unique_ptr<T> make_unique(Args&&... args) {
-+      return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-+    }
++namespace std {
++  /// make_unique implementation
++  template<typename T, typename... Args>
++  std::unique_ptr<T> make_unique(Args&&... args) {
++    return std::unique_ptr<T>(new T(std::forward<Args>(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 <pthread.h>
+ #endif  // __POSIX__
+ 
++#ifndef __cpp_lib_make_unique
++namespace std {
++  /// make_unique implementation
++  template<typename T, typename... Args>
++  std::unique_ptr<T> make_unique(Args&&... args) {
++    return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
++  }
++}
++#endif
++
+ namespace node {
+ namespace inspector {
+ namespace {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.