Commit 97abe3c9 authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook GitHub Bot

Remove virtual inheritance in AsyncSocket

Summary: [Folly] Remove unused virtual inheritance in `AsyncSocket`.

Differential Revision: D20966977

fbshipit-source-id: 502ab00438eebed0d8ebcf32ef602af50b05df47
parent 1864bd5f
...@@ -73,14 +73,7 @@ namespace folly { ...@@ -73,14 +73,7 @@ namespace folly {
#define SO_NO_TSOCKS 201 #define SO_NO_TSOCKS 201
#endif #endif
#ifdef _MSC_VER class AsyncSocket : public AsyncTransportWrapper {
// We do a dynamic_cast on this, in
// AsyncTransportWrapper::getUnderlyingTransport so be safe and
// force displacements for it. See:
// https://msdn.microsoft.com/en-us/library/7sf3txa8.aspx
#pragma vtordisp(push, 2)
#endif
class AsyncSocket : virtual public AsyncTransportWrapper {
public: public:
using UniquePtr = std::unique_ptr<AsyncSocket, Destructor>; using UniquePtr = std::unique_ptr<AsyncSocket, Destructor>;
...@@ -1336,8 +1329,5 @@ class AsyncSocket : virtual public AsyncTransportWrapper { ...@@ -1336,8 +1329,5 @@ class AsyncSocket : virtual public AsyncTransportWrapper {
bool closeOnFailedWrite_{true}; bool closeOnFailedWrite_{true};
}; };
#ifdef _MSC_VER
#pragma vtordisp(pop)
#endif
} // namespace folly } // namespace folly
...@@ -732,9 +732,9 @@ class AsyncWriter { ...@@ -732,9 +732,9 @@ class AsyncWriter {
// Transitional intermediate interface. This is deprecated. // Transitional intermediate interface. This is deprecated.
// Wrapper around folly::AsyncTransport, that includes read/write callbacks // Wrapper around folly::AsyncTransport, that includes read/write callbacks
class AsyncTransportWrapper : virtual public AsyncTransport, class AsyncTransportWrapper : public AsyncTransport,
virtual public AsyncReader, public AsyncReader,
virtual public AsyncWriter { public AsyncWriter {
public: public:
using UniquePtr = std::unique_ptr<AsyncTransportWrapper, Destructor>; using UniquePtr = std::unique_ptr<AsyncTransportWrapper, Destructor>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment