src: inherit first from AsyncWrap

trevnorris · trevnorris · commit ddc19be6de1b · 2016-05-24T14:36:47.000-06:00
To make sure casting a class of multiple inheritance from a void* to AsyncWrap succeeds make AsyncWrap the first inherited class. PR-URL: #6184 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/src/js_stream.cc b/src/js_stream.cc
@@ -22,8 +22,8 @@ using v8::Value;
 
 
 JSStream::JSStream(Environment* env, Local<Object> obj, AsyncWrap* parent)
-    : StreamBase(env),
-      AsyncWrap(env, obj, AsyncWrap::PROVIDER_JSSTREAM, parent) {
+    : AsyncWrap(env, obj, AsyncWrap::PROVIDER_JSSTREAM, parent),
+      StreamBase(env) {
   node::Wrap(obj, this);
   MakeWeak<JSStream>(this);
 }
diff --git a/src/js_stream.h b/src/js_stream.h
@@ -8,7 +8,7 @@
 
 namespace node {
 
-class JSStream : public StreamBase, public AsyncWrap {
+class JSStream : public AsyncWrap, public StreamBase {
  public:
   static void Initialize(v8::Local<v8::Object> target,
                          v8::Local<v8::Value> unused,
diff --git a/src/node_crypto.h b/src/node_crypto.h
@@ -322,7 +322,7 @@ class SSLWrap {
 // Connection inherits from AsyncWrap because SSLWrap makes calls to
 // MakeCallback, but SSLWrap doesn't store the handle itself. Instead it
 // assumes that any args.This() called will be the handle from Connection.
-class Connection : public SSLWrap<Connection>, public AsyncWrap {
+class Connection : public AsyncWrap, public SSLWrap<Connection> {
  public:
   ~Connection() override {
 #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
@@ -387,8 +387,8 @@ class Connection : public SSLWrap<Connection>, public AsyncWrap {
              v8::Local<v8::Object> wrap,
              SecureContext* sc,
              SSLWrap<Connection>::Kind kind)
-      : SSLWrap<Connection>(env, sc, kind),
-        AsyncWrap(env, wrap, AsyncWrap::PROVIDER_CRYPTO),
+      : AsyncWrap(env, wrap, AsyncWrap::PROVIDER_CRYPTO),
+        SSLWrap<Connection>(env, sc, kind),
         bio_read_(nullptr),
         bio_write_(nullptr),
         hello_offset_(0) {

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ using v8::Value;`
`22`	`22`
`23`	`23`
`24`	`24`	`JSStream::JSStream(Environment* env, Local<Object> obj, AsyncWrap* parent)`
`25`		`- : StreamBase(env),`
`26`		`- AsyncWrap(env, obj, AsyncWrap::PROVIDER_JSSTREAM, parent) {`
	`25`	`+ : AsyncWrap(env, obj, AsyncWrap::PROVIDER_JSSTREAM, parent),`
	`26`	`+ StreamBase(env) {`
`27`	`27`	`node::Wrap(obj, this);`
`28`	`28`	`MakeWeak<JSStream>(this);`
`29`	`29`	`}`